Merge branch 'develop' into 13_doc

ChangeLog

@@ -4,153 +4,155 @@ English Dolibarr ChangeLog
 
 
 ***** ChangeLog for 13.0.0 compared to 12.0.0 *****
+
 For users:
+----------
 NEW: Add module "Credit transfer SEPA" to manage payment of vendors using bank credit transfer SEPA files.
 NEW: Module Reception (for a more accurate management of your receptions) moved from experimental to stable.
 NEW: Several security issues after a private bug bounty campaign. 
 NEW: #15065 Put the product label in bold in the PDF templates if configured
-NEW: Accountancy - Add chart of sub accounts
+NEW: Accountancy - add chart of sub accounts
-NEW: Accountancy - Add options to disable binding on sales, purchases & expense reports independently of the modules
+NEW: Accountancy - add options to disable binding on sales, purchases & expense reports independently of the modules
-NEW: Accountancy balance - Add a menu entry to show subtotal by group
+NEW: Accountancy balance - add a menu entry to show subtotal by group
-NEW: Accountancy - Move to real ledger, real journals, menu disposition
+NEW: Accountancy - move to real ledger, real journals, menu disposition
-NEW: Accountancy - On transfers, select the periodicity by default
+NEW: Accountancy - on transfers, select the periodicity by default
-NEW: New currency rate editor.
+NEW: new currency rate editor
-NEW: Add 2 rules for emailcollector: Message send/not sent from Dolibarr
+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 a counter of number of words for pages in website module
-NEW: add alert before changing thirdparty in takepos
+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 page to list Stock at a given date in the past
-NEW: Add a start date to begin binding in accountancy
+NEW: add a start date to begin binding in accountancy
-NEW: Add a statistics page to list popularity of products on invoices
+NEW: add a statistics page to list popularity of products on invoices
-NEW: Add calendar selection for agenda view
+NEW: add calendar selection for agenda view
-NEW: Support documents generation for ticket edition (pdf or odt)
+NEW: Support documents generation for ticket edition (PDF or ODT)
-NEW: Add column payment term into list of supplier invoices.
+NEW: add column payment term into list of supplier invoices
-NEW: Add column quantity in product margin page
+NEW: add column quantity in product margin page
-NEW: Add column vat rate in page to define accounting account on product/service
+NEW: add column vat rate in page to define accounting account on product/service
-NEW: Add common list function for available app/module page
+NEW: add common list function for available app/module page
 NEW: add costprice in fields of products list
-NEW: Added an import profile for CUSTOMER ORDER, PO, PROPOSAL MODULE, SUPPLIER INVOICE
+NEW: added an import profile for CUSTOMER ORDER, PO, PROPOSAL MODULE, SUPPLIER INVOICE
-NEW: Added incoterms dara into the substitution array
+NEW: added incoterms data into the substitution array
-NEW: Add employee link in expense report binding page
+NEW: add employee link in expense report binding page
-NEW: Add export for various payment
+NEW: add export for various payment
-NEW: add extra fields labels and values in mail on create ticket
+NEW: add Extrafields labels and values in mail on create ticket
-NEW: Add extrafields support on ECM module
+NEW: add Extrafields support on ECM module
-NEW: Add filter rules "is answer" and "is not answer" in email collector
+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 formConfirm hook on product page
 NEW: add free text on each terminal of cash desk
-NEW: Add function dolButtonToOpenUrlInDialogPopup() to be able to open
+NEW: add function dolButtonToOpenUrlInDialogPopup() to be able to open
-NEW: Add global search for customer payments and vendor payments
+NEW: add global search for customer payments and vendor payments
-NEW: Add global search for miscellaneous payments
+NEW: add global search for miscellaneous payments
-NEW: Add helper function for table headers with numbers
+NEW: add helper function for table headers with numbers
 NEW: add hooks on stats pages
-NEW: Add link to edit property from search result of website pages
+NEW: add link to edit property from search result of website pages
-NEW: Add link to reset qty on supplier dispatch page
+NEW: add link to reset qty on supplier dispatch page
 NEW: add MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const to remove header stored by email collector
-NEW: Add Manufacturing Orders attached files into the automatic ECM view
+NEW: add Manufacturing Orders attached files into the automatic ECM view
 NEW: add margin info in invoice list
-NEW: Add mass action to set category on a list of website pages.
+NEW: add mass action to set category on a list of website pages
-NEW: Add mass deletion for events
+NEW: add mass deletion for events
-NEW: Add mass deletion for draft invoices
+NEW: add mass deletion for draft invoices
-NEW: Add __MEMBER_TYPE__ substitution key
+NEW: add __MEMBER_TYPE__ substitution key
-NEW: Add a message in error_log after detection of SQL or script injection
+NEW: add a message in error_log after detection of SQL or script injection
-NEW: Add module Credit transfer SEPA to manage payment of supplier using
+NEW: add module Credit transfer SEPA to manage payment of supplier using
-NEW: Add more filters on monthly statement list
+NEW: add more filters on monthly statement list
-NEW: Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
+NEW: add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
-NEW: Add option to define a default warehouse at user level
+NEW: add option to define a default warehouse at user level
-NEW: Add option to include products without alert in replenish
+NEW: add option to include products without alert in replenish
 NEW: add order by lastname and firstname by default in get sales representatives
-NEW: Add param to not show links when output tags
+NEW: add param to not show links when output tags
-NEW: Add PDF document templates for warehouses (list of stock)
+NEW: add PDF document templates for warehouses (list of stock)
-NEW: Add property cssview when declaring fields of an object
+NEW: add property cssview when declaring fields of an object
-NEW: Add prospect status managment for the contact with managment of custom icon
+NEW: add prospect status managment for the contact with managment of custom icon
-NEW: Add public note on products. This also partially fix the #14342
+NEW: add public note on products ; this also partially fix the #14342
-NEW: Add quick dropdown menu in top right menu (MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
+NEW: add quick dropdown menu in top right menu (MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
 NEW: add region in export companies and contacts
 NEW: add rights on margin info on invoice list
-NEW: Add search param for close date on order list
+NEW: add search param for close date on order list
 NEW: add send context for ticket
-NEW: Add show preview for mail attachement on form mail
+NEW: add show preview for mail attachement on form mail
 NEW: add state origin for product
 NEW: add State/Province origin for products
-NEW: Add the workflow interaction close intervention on closing ticket
+NEW: add the workflow interaction close intervention on closing ticket
-NEW: Add third order printer to TakePOS
+NEW: add third order printer to TakePOS
 NEW: add tracking number in list and search_all items
 NEW: add two hooks printFieldListFrom and printFieldSearchParam
-NEW: Add __TYPE__ substitution key
+NEW: add __TYPE__ substitution key
-NEW: Add validation of MX domain for emails
+NEW: add validation of MX domain for emails
 NEW: add vcard for aderent and user
 NEW: add week number for month view in agenda
 NEW: Algeria data (tva and forme_juridique)
-NEW: Allow click on all header numbers on commerce area
+NEW: allow click on all header numbers on commerce area
-NEW: Allow to reopen interventions (green button)
+NEW: allow to reopen interventions (green button)
-NEW: Allow zero quality on supplier/vendor order line
+NEW: allow zero quality on supplier/vendor order line
-NEW: Appearance tab in TakePOS with more visual parameters
+NEW: appearance tab in TakePOS with more visual parameters
-NEW: Better currency rate editor
+NEW: better currency rate editor
-NEW: Calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') )
+NEW: calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') )
-NEW: Can add event to log into blockedlog module with a constant.
+NEW: can add event to log into blockedlog module with a constant
-NEW: Can build vendor invoice from vendor orders
+NEW: can build vendor invoice from vendor orders
-NEW: Can change a product in line of recurring invoice or contract
+NEW: can change a product in line of recurring invoice or contract
-NEW: Can change size of logo on PDF documents
+NEW: can change size of logo on PDF documents
-NEW: Can change VAT rate of all lines of a draft object in one step.
+NEW: can change VAT rate of all lines of a draft object in one step
-NEW: Can define date range of validity of a login during creation
+NEW: can define date range of validity of a login during creation
-NEW: Can disable, from edit page, the whole web site
+NEW: can disable, from edit page, the whole web site
 NEW: can edit and set sales representatives directly on thirdparty card
 NEW: Can edit the list of sending email profiles.
-NEW: Can enable/disable users in bulk actions
+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 accounting system ref in export of chart of account
-NEW: Can filter on container type, language and tags in the list of pages
+NEW: can filter on container type, language and tags in the list of pages
-NEW: Can force the antivirus from conf file or autoprepend ini setup.
+NEW: can force the antivirus from conf file or autoprepend ini setup
-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_SELLBY and PRODUCT_DISABLE_EATBY
-NEW: Can import proposals, sales orders, supplier invoices
+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 tags/categories to website pages
-NEW: Can set type of price without tax per default for new sale price creation
+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: can use desired stock of a given warehouse for replenishment
-NEW: Can use THEME_DARKMODEENABLED=2 for a preview of theme in dark mode
+NEW: can use THEME_DARKMODEENABLED=2 for a preview of theme in dark mode
-NEW: change thirdparty with barcode scan in takepos
+NEW: change thirdparty with barcode scan in TakePOS
-NEW: Common behavior for monthly leave list view
+NEW: common behavior for monthly leave list view
 NEW: conf to allow show full arbo in warehouse getnomurl
 NEW: convert all subscription in datetime
-NEW: create thirdparty customer from TAKEPOS
+NEW: create thirdparty customer from TakePOS
-NEW: Date shipment from order accepts hours
+NEW: date shipment from order accepts hours
-NEW: Declinaison price level compatibility
+NEW: declinaison price level compatibility
-NEW: Delayed payment in TakePOS
+NEW: delayed payment in TakePOS
-NEW: Development of module Recruitment
+NEW: development of module Recruitment
-NEW: display date range if exist in takepos
+NEW: display date range if exist in TakePOS
-NEW: display resiliate status in takepos for member
+NEW: display resiliate status in TakePOS for member
 NEW: display stat for BOM on "object referent"/linked Object product tab
 NEW: edit and update a ticket
 NEW: edit or delete dispatched lines
-NEW: Email configuration - Allow auto signed certificat when smtp ssl activated
+NEW: Email configuration - allow auto signed certificat when smtp ssl activated
 NEW: enable free emails input with select2
 NEW: endpoint getContacts and Clean results
 NEW: Events in agenda for contact
 NEW: Field to link website page to an other object
-NEW: Fill ECM src object fields in dol_add_file_process
+NEW: fill ECM src object fields in dol_add_file_process
 NEW: filter on progress column in task list
 NEW: filter product list by country and/or state/province
 NEW: format tickets sent by mail in public interface
 NEW: add juridical status for Algeria
 NEW: form to add customer/supplier into categories
-NEW: Framework is ready for CSRF token protection on explicit GET URLs.
+NEW: Framework is ready for CSRF token protection on explicit GET URLs
 NEW: get all child recursively
-NEW: Get contacts list of a given order
+NEW: get contacts list of a given order
 NEW: helper functions for export with phpspreadsheet
 NEW: hide closed contract lines
-NEW: hide label in pdf for variants
+NEW: hide label in PDF for variants
 NEW: Hook on propal card
-NEW: If specific help page is available, we change color of icon
+NEW: if specific help page is available, we change color of icon
-NEW: Include the tag editor of page as a popup into website editor
+NEW: include the tag editor of page as a popup into website editor
-NEW: Introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
+NEW: introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
-NEW: Introducing new modal boxes in TakePOS
+NEW: introducing new modal boxes in TakePOS
-NEW: Keep takepos terminal when login/logout
+NEW: keep TakePOS terminal when login/logout
-NEW: Link on balance to the ledger
+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: more filter for "View change logs"
-NEW: multicurrency total in takepos
+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
@@ -159,38 +161,38 @@ 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 Import/Export 'default warehouse' and 'use batch number' fields
-NEW: Purchase price table: Added filterable table columns
+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: restrict thirdparty to customer in TakePOS
-NEW: Allow to edit "demand reason" field though API
+NEW: allow to edit "demand reason" field though API
 NEW: Rule "email to" accept wildcard *
 NEW: Save filter of the project homepage
-NEW: Select-able columns on customer invoice paymnet list
+NEW: select-able columns on customer invoice paymnet list
-NEW: Select-able columns on miscellaneous payments + more data columns
+NEW: select-able columns on miscellaneous payments + more data columns
-NEW: Select-able columns on social taxes list
+NEW: select-able columns on social taxes list
-NEW: Select-able columns on supplier invoice payment list
+NEW: select-able columns on supplier invoice payment list
 NEW: send context and remove new lines on create ticket
 NEW: set entity when creating invoice on takepos
-NEW: Show available stock in TakePOS
+NEW: show available stock in TakePOS
-NEW: Show category filter on lists only when user have rights to read categories
+NEW: show category filter on lists only when user have rights to read categories
-NEW: Show header number and make it clickable in warehouse arean, payment area, shipment area
+NEW: show header number and make it clickable in warehouse arean, payment area, shipment area
-NEW: Show image of user in the combo select of users
+NEW: show image of user in the combo select of users
-NEW: Show label on batch card
+NEW: show label on batch card
-NEW: Show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
+NEW: show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
 NEW: show links for select and multi-select in category extra field
-NEW: Show module and permission ids on user/group rights (only admin)
+NEW: show module and permission ids on user/group rights (only admin)
-NEW: Show place from events on import calender
+NEW: show place from events on import calender
-NEW: Show references in contract form on interventions
+NEW: show references in contract form on interventions
-NEW: Show tags and status in search list of website pages
+NEW: show tags and status in search list of website pages
-NEW: Show user on external calender events (when found)
+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 connector compatibility with RECEIPT PRINTERS module
 NEW: TakePOS Gift Receipt
 NEW: TakePOS Multicurrency compatibility
-NEW: The global header of a website can also have dynamic content
+NEW: the global header of a website can also have dynamic content
 NEW: Third-Party 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
@@ -199,16 +201,18 @@ NEW: translate classification labels in ticket
 NEW: triggers create, modify, delete
 NEW: VAT for Algeria
 NEW: Use preselect third-party from list on new card
-NEW: Vat report - Invert constant to show by default zero vat in reports
+NEW: VAT report - Invert constant to show by default zero vat in reports
 NEW: website page fields selection
 NEW: Weighing Scale compatibility with TakePOS connector
-NEW: When creating a user from a member linked to a thirdparty, you can choose to create if as external or internal user
+NEW: when creating a user from a member linked to a thirdparty, you can choose to create if as external or internal user
-NEW: Add clone functionality on miscellaneous payment
+NEW: add clone functionality on miscellaneous payment
+
 
 For developers:
+---------------
 NEW: Can use dynamic code into the 'enabled' property of DAO fields
-NEW: API Can update a payment
+NEW: API can update a payment
-NEW: api get member by thirdparty
+NEW: API get member by thirdparty
 NEW: API get thirdparty by barcode
 NEW: API get users by email / login
 NEW: fetch contact by email with REST API
@@ -216,14 +220,15 @@ NEW: field ref_ext in llx_commandedet
 NEW: fields ref_ext for Attributes and Combinations
 NEW: get state by REST API
 NEW: get state dictionnary by REST API
-NEW: Improve Product API for variant products
+NEW: improve Product API for variant products
-NEW: Oauth SCOPE for Admin SDK
+NEW: OAuth SCOPE for Admin SDK
-NEW: Retrieve discount from invoice from API
+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: Thirdparty REST API: endpoint to set price level
-NEW: Use new category API for project list view
+NEW: use new category API for project list view
 NEW: Triggers Attributes and Attributes values
-NEW: Add hooks on newpayment page to allow external payment modules
+NEW: add hooks on newpayment page to allow external payment modules
+
 
 WARNING:
 
@@ -289,6 +294,7 @@ FIX: Visualization rights correction on last modified contacts box
 FIX: Wrong redirection
 FIX: Yogosha report 4425 (backport)
 
+
 ***** ChangeLog for 12.0.2 compared to 12.0.1 *****
 FIX: computation of the bottom margin of <body> returns NaN because body is not loaded yet
 FIX: DebugBar hides content at page bottom

htdocs/adherents/document.php

@@ -37,7 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 $langs->loadLangs(array("companies", "members", "other"));
 
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTISSET('id') ? GETPOST('id', 'int') : GETPOST('rowid', 'int');
+$ref = GETPOST('ref', 'alphanohtml');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
@@ -60,7 +61,7 @@ if (!$sortfield) $sortfield = "name";
 $form = new Form($db);
 $object = new Adherent($db);
 $membert = new AdherentType($db);
-$result = $object->fetch($id);
+$result = $object->fetch($id, $ref);
 if ($result < 0) {
 	dol_print_error($db);
 	exit;

htdocs/bom/bom_document.php

@@ -69,8 +69,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->bom->multidir_output[$object->entity?$object->entity:1] . "/bom/" . dol_sanitizeFileName($object->id);
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->bom->multidir_output[$object->entity ? $object->entity : 1]."/bom/".get_exdir(0, 0, 0, 1, $object);
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->bom->multidir_output[$object->entity ? $object->entity : 1]."/bom/".dol_sanitizeFileName($object->ref);
 
 
 /*

htdocs/bookmarks/card.php

@@ -153,7 +153,7 @@ if ($action == 'create')
 
 	print '<table class="border centpercent tableforfieldcreate">';
 
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input id="titlebookmark" class="flat minwidth100" name="title" value="'.$title.'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input id="titlebookmark" class="flat minwidth300" name="title" value="'.dol_escape_htmltag($title).'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
 	dol_set_focus('#titlebookmark');
 
 	// Url
@@ -167,12 +167,12 @@ if ($action == 'create')
 
 	// Owner
 	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
-	print img_picto('', 'user').' '.$form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : $user->id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
 
 	// Position
 	print '<tr><td>'.$langs->trans("Position").'</td><td>';
-	print '<input class="flat" name="position" size="5" value="'.(isset($_POST["position"]) ? $_POST["position"] : $object->position).'">';
+	print '<input class="flat" name="position" size="5" value="'.(GETPOSTISSET("position") ? GETPOST("position", 'int') : $object->position).'">';
 	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
 
 	print '</table>';
@@ -238,7 +238,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	}
 
 	print '</td><td>';
-	if ($action == 'edit') print '<input class="flat minwidth200" name="title" value="'.(isset($_POST["title"]) ?GETPOST("title", '', 2) : $object->title).'">';
+	if ($action == 'edit') print '<input class="flat minwidth300" name="title" value="'.(GETPOSTISSET("title") ? GETPOST("title", '', 2) : $object->title).'">';
 	else print $object->title;
 	print '</td></tr>';
 
@@ -251,7 +251,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 		print '</span>';
 	}
 	print '</td><td>';
-	if ($action == 'edit') print '<input class="flat minwidth500" name="url" value="'.(isset($_POST["url"]) ? $_POST["url"] : $object->url).'">';
+	if ($action == 'edit') print '<input class="flat minwidth500 quatrevingtpercent" name="url" value="'.(GETPOSTISSET("url") ? GETPOST("url") : $object->url).'">';
 	else print '<a href="'.(preg_match('/^http/i', $object->url) ? $object->url : DOL_URL_ROOT.$object->url).'"'.($object->target ? ' target="_blank"' : '').'>'.$object->url.'</a>';
 	print '</td></tr>';
 
@@ -259,7 +259,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	if ($action == 'edit')
 	{
 		$liste = array(1=>$langs->trans("OpenANewWindow"), 0=>$langs->trans("ReplaceWindow"));
-		print $form->selectarray('target', $liste, isset($_POST["target"]) ? $_POST["target"] : $object->target);
+		print $form->selectarray('target', $liste, GETPOSTISSET("target") ? GETPOST("target") : $object->target);
 	} else {
 		if ($object->target == 0) print $langs->trans("ReplaceWindow");
 		if ($object->target == 1) print $langs->trans("OpenANewWindow");
@@ -269,7 +269,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
 	if ($action == 'edit' && $user->admin)
 	{
-		print img_picto('', 'user').' '.$form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+		print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	} else {
 		if ($object->fk_user > 0)
 		{
@@ -284,7 +284,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 
 	// Position
 	print '<tr><td>'.$langs->trans("Position").'</td><td>';
-	if ($action == 'edit') print '<input class="flat" name="position" size="5" value="'.(isset($_POST["position"]) ? $_POST["position"] : $object->position).'">';
+	if ($action == 'edit') print '<input class="flat" name="position" size="5" value="'.(GETPOSTISSET("position") ? GETPOST("position", 'int') : $object->position).'">';
 	else print $object->position;
 	print '</td></tr>';
 

htdocs/bookmarks/list.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2012 Laurent Destailleur       <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2020 Laurent Destailleur       <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -197,14 +197,14 @@ while ($i < min($num, $limit))
 	// Title
 	print "<td>";
 	$linkintern = 1;
-	if ($linkintern) print "<a href=\"".$obj->url."\">";
+	if ($linkintern) print '<a href="'.$obj->url.'">';
 	print $title;
 	if ($linkintern) print "</a>";
 	print "</td>\n";
 
 	// Url
 	print '<td class="tdoverflowmax200">';
-	if (!$linkintern) print '<a href="'.$obj->url.'"'.($obj->target ? ' target="newlink"' : '').'>';
+	if (!$linkintern) print '<a href="'.$obj->url.'"'.($obj->target ? ' target="newlink" rel="noopener"' : '').'>';
 	print $link;
 	if (!$linkintern) print '</a>';
 	print "</td>\n";
@@ -241,7 +241,7 @@ while ($i < min($num, $limit))
 	print '<td class="nowrap right">';
 	if ($user->rights->bookmark->creer)
 	{
-		print '<a class="editfielda" href="'.DOL_URL_ROOT."/bookmarks/card.php?action=edit&token='.newToken().'&id=".$obj->rowid."&backtopage=".urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
+		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
 	}
 	if ($user->rights->bookmark->supprimer)
 	{

htdocs/cashdesk/include/environnement.php

@@ -32,7 +32,7 @@ $conf_db_base = $dolibarr_main_db_name;
 $conf_fksoc = (!empty($_SESSION["CASHDESK_ID_THIRDPARTY"])) ? $_SESSION["CASHDESK_ID_THIRDPARTY"] : ($conf->global->CASHDESK_ID_THIRDPARTY > 0 ? $conf->global->CASHDESK_ID_THIRDPARTY : 0);
 // Identifiant unique correspondant a l'entrepot a utiliser
 $conf_fkentrepot = (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"])) ? $_SESSION["CASHDESK_ID_WAREHOUSE"] : ($conf->global->CASHDESK_ID_WAREHOUSE > 0 ? $conf->global->CASHDESK_ID_WAREHOUSE : 0);
-if (!empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) $conf_fkentrepot = 0; // If option to disable stock decrease is on, we set warehouse id to 0.
+if (!empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) $conf_fkentrepot = 0; // If option to disable the stock decrease is on, we set warehouse id to 0.
 
 // Identifiant unique correspondant au compte caisse / liquide
 $conf_fkaccount_cash = (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"])) ? $_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"] : ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH > 0 ? $conf->global->CASHDESK_ID_BANKACCOUNT_CASH : 0);
@@ -46,6 +46,3 @@ $conf_fkaccount_cb = (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CB"])) ? $_SESSI
 // View parameters
 $conf_taille_listes = (empty($conf->global->PRODUIT_LIMIT_SIZE) ? 1000 : $conf->global->PRODUIT_LIMIT_SIZE); // Number max of lines to show in lists
 $conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes
-
-// Add hidden option to force decrease of stock whatever is user setup
-if (!empty($conf->global->CASHDESK_FORCE_STOCK_ON_BILL)) $conf->global->STOCK_CALCULATE_ON_BILL = 1;

htdocs/commande/class/commande.class.php

@@ -2014,7 +2014,7 @@ class Commande extends CommonOrder
 		$sql .= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
 		$sql .= ' l.fk_unit,';
 		$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
-		$sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch,';
+		$sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch,';
 		$sql .= ' p.weight, p.weight_units, p.volume, p.volume_units';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
@@ -2077,6 +2077,8 @@ class Commande extends CommonOrder
 				$line->libelle = $objp->product_label;
 				$line->product_label = $objp->product_label;
 				$line->product_desc     = $objp->product_desc;
+				$line->product_tosell   = $objp->product_tosell;
+				$line->product_tobuy    = $objp->product_tobuy;
 				$line->product_tobatch  = $objp->product_tobatch;
 				$line->fk_product_type  = $objp->fk_product_type; // Produit ou service
 				$line->fk_unit          = $objp->fk_unit;

htdocs/core/class/commondocgenerator.class.php

@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2012	Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2016       Charlie Benke           <charlie@patas-monkey.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Josep Lluís Amador      <joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -120,7 +120,11 @@ abstract class CommonDocGenerator
 	{
 		global $conf, $extrafields;
 
-		$logotouse = $conf->adherent->dir_output.'/'.get_exdir($member->id, 2, 0, 1, $member, 'user').'/'.$member->photo;
+		if ($member->photo) {
+			$logotouse = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $member, 'user').'/photos/'.$member->photo;
+		} else {
+			$logotouse = DOL_DOCUMENT_ROOT . '/public/theme/common/nophoto.png';
+		}
 
 		$array_member = array(
 			'mymember_lastname' => $member->lastname,

htdocs/core/class/commonobject.class.php

@@ -62,6 +62,11 @@ abstract class CommonObject
 	 */
 	public $error;
 
+	/**
+	 * @var string 		Error string that is hidden but can be used to store complementatry technical code.
+	 */
+	public $errorhidden;
+
 	/**
 	 * @var string[]	Array of error strings
 	 */

htdocs/core/class/extrafields.class.php

@@ -2038,7 +2038,7 @@ class ExtraFields
 					$value_arr = GETPOST("options_".$key, 'alpha');
 					$value_key = price2num($value_arr);
 				} elseif (in_array($key_type, array('html'))) {
-					$value_key = GETPOST("options_".$key, 'alpha');
+					$value_key = GETPOST("options_".$key, 'restricthtml');
 				} elseif (in_array($key_type, array('text'))) {
 					$value_key = GETPOST("options_".$key, 'alphanohtml');
 				} else {

htdocs/core/class/html.form.class.php

@@ -188,7 +188,8 @@ class Form
 		{
 			$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
 		} else {
-			if (GETPOST('action', 'aZ09') == 'edit'.$htmlname)
+			$editmode = (GETPOST('action', 'aZ09') == 'edit'.$htmlname);
+			if ($editmode)
 			{
 				$ret .= "\n";
 				$ret .= '<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam ? '?'.$moreparam : '').'">';
@@ -1463,10 +1464,10 @@ class Form
 		}
 
 		// We search third parties
-		$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";
+		$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste, sp.email, sp.phone, sp.phone_perso, sp.phone_mobile, sp.town AS contact_town";
-		if ($showsoc > 0) $sql .= " , s.nom as company";
+		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) $sql .= ", s.nom as company, s.town AS company_town";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-		if ($showsoc > 0) $sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";
+		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) $sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";
 		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		if ($socid > 0 || $socid == -1) $sql .= " AND sp.fk_soc=".$socid;
 		if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql .= " AND sp.statut <> 0";
@@ -1499,6 +1500,28 @@ class Form
 				{
 					$obj = $this->db->fetch_object($resql);
 
+					// Set email (or phones) and town extended infos
+					$extendedInfos = '';
+					if (!empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
+						$extendedInfos = array();
+						$email = trim($obj->email);
+						if (!empty($email)) $extendedInfos[] = $email;
+						else {
+							$phone = trim($obj->phone);
+							$phone_perso = trim($obj->phone_perso);
+							$phone_mobile = trim($obj->phone_mobile);
+							if (!empty($phone)) $extendedInfos[] = $phone;
+							if (!empty($phone_perso)) $extendedInfos[] = $phone_perso;
+							if (!empty($phone_mobile)) $extendedInfos[] = $phone_mobile;
+						}
+						$contact_town = trim($obj->contact_town);
+						$company_town = trim($obj->company_town);
+						if (!empty($contact_town)) $extendedInfos[] = $contact_town;
+						elseif (!empty($company_town)) $extendedInfos[] = $company_town;
+						$extendedInfos = implode(' - ', $extendedInfos);
+						if (!empty($extendedInfos)) $extendedInfos = ' - ' . $extendedInfos;
+					}
+
 					$contactstatic->id = $obj->rowid;
 					$contactstatic->lastname = $obj->lastname;
 					$contactstatic->firstname = $obj->firstname;
@@ -1513,7 +1536,7 @@ class Form
 								$out .= '<option value="'.$obj->rowid.'"';
 								if ($disabled) $out .= ' disabled';
 								$out .= ' selected>';
-								$out .= $contactstatic->getFullName($langs);
+								$out .= $contactstatic->getFullName($langs) . $extendedInfos;
 								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
@@ -1521,7 +1544,7 @@ class Form
 								$out .= '<option value="'.$obj->rowid.'"';
 								if ($disabled) $out .= ' disabled';
 								$out .= '>';
-								$out .= $contactstatic->getFullName($langs);
+								$out .= $contactstatic->getFullName($langs) . $extendedInfos;
 								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
@@ -1529,7 +1552,7 @@ class Form
 						} else {
 							if (in_array($obj->rowid, $selected))
 							{
-								$out .= $contactstatic->getFullName($langs);
+								$out .= $contactstatic->getFullName($langs) . $extendedInfos;
 								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 							}
@@ -4384,7 +4407,7 @@ class Form
             </script>';
 			$formconfirm .= "<!-- end ajax formconfirm -->\n";
 		} else {
-			$formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";
+			$formconfirm .= "\n<!-- begin formconfirm page=".dol_escape_htmltag($page)." -->\n";
 
 			if (empty($disableformtag)) $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
 
@@ -4415,7 +4438,7 @@ class Form
 			$formconfirm .= '<td class="valid">';
 			$formconfirm .= $this->selectyesno("confirm", $newselectedchoice);
 			$formconfirm .= '</td>';
-			$formconfirm .= '<td class="valid center"><input class="button valignmiddle" type="submit" value="'.$langs->trans("Validate").'"></td>';
+			$formconfirm .= '<td class="valid center"><input class="button valignmiddle confirmvalidatebutton" type="submit" value="'.$langs->trans("Validate").'"></td>';
 			$formconfirm .= '</tr>'."\n";
 
 			$formconfirm .= '</table>'."\n";
@@ -4423,6 +4446,23 @@ class Form
 			if (empty($disableformtag)) $formconfirm .= "</form>\n";
 			$formconfirm .= '<br>';
 
+			if (empty($conf->use_javascript_ajax)) {
+				$formconfirm .= '<!-- code to disable button to avoid double clic -->';
+				$formconfirm .= '<script type="text/javascript">'."\n";
+				$formconfirm .= '
+				$(document).ready(function () {
+					$(".confirmvalidatebutton").on("click", function() {
+						console.log("We click on button");
+						$(this).attr("disabled", "disabled");
+						setTimeout(\'$(".confirmvalidatebutton").removeAttr("disabled")\', 3000);
+						//console.log($(this).closest("form"));
+						$(this).closest("form").submit();
+					});
+				});
+				';
+				$formconfirm .= '</script>'."\n";
+			}
+
 			$formconfirm .= "<!-- end formconfirm -->\n";
 		}
 

htdocs/core/js/lib_notification.js.php

@@ -105,8 +105,8 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
 
                             if (value.type == 'agenda')
                             {
-                             	url = '<?php echo DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
+                             	url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
-                                title = '<?php print $langs->trans('EventReminder') ?>';
+                                title = '<?php print dol_escape_js($langs->trans('EventReminder')) ?>';
                             }
                             var extra = {
                                 icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',

htdocs/core/lib/functions.lib.php

@@ -3190,7 +3190,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
 				'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cubes',
-				'delete', 'dolly', 'dollyrevert', 'donation', 'edit', 'ellipsis-h', 'email', 'external-link-alt', 'external-link-square-alt',
+				'delete', 'dolly', 'dollyrevert', 'donation', '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', 'list', 'listlight', 'lot',
@@ -5525,23 +5525,25 @@ function yn($yesno, $case = 1, $color = 0)
 
 /**
  *	Return a path to have a the directory according to object where files are stored.
- *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart)
+ *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, '')
- *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, $modulepart)     if multidir_output not defined.
+ *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, '')     if multidir_output not defined.
  *  Example our with new usage:       $object is invoice -> 'INYYMM-ABCD'
  *  Example our with old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"
  *
- *	@param	string	$num            Id of object (deprecated, $object will be used in future)
+ *	@param	string|int	$num            Id of object (deprecated, $object will be used in future)
  *	@param  int			$level		    Level of subdirs to return (1, 2 or 3 levels). (deprecated, global option will be used in future)
  * 	@param	int			$alpha		    0=Keep number only to forge path, 1=Use alpha part afer the - (By default, use 0). (deprecated, global option will be used in future)
  *  @param  int			$withoutslash   0=With slash at end (except if '/', we return ''), 1=without slash at end
- *  @param	Object	$object			Object
+ *  @param	Object		$object			Object to use to get ref to forge the path.
- *  @param	string	$modulepart		Type of object ('invoice_supplier, 'donation', 'invoice', ...')
+ *  @param	string		$modulepart		Type of object ('invoice_supplier, 'donation', 'invoice', ...'). Use '' for autodetect from $object.
  *  @return	string						Dir to use ending. Example '' or '1/' or '1/2/'
  */
-function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
+function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '')
 {
 	global $conf;
 
+	if (empty($modulepart) && !empty($object->module)) $modulepart = $object->module;
+
 	$path = '';
 
 	$arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');
@@ -5556,14 +5558,12 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 		if ($level == 2) $path = substr($num, 1, 1).'/'.substr($num, 0, 1);
 		if ($level == 3) $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
 	} else {
-		// TODO
+		// We will enhance here a common way of forging path for document storage.
-		// We will enhance here a common way of forging path for document storage
+		// In a future, we may distribut directories on several levels depending on setup and object.
-		// Here, object->id, object->ref and modulepart are required.
+		// Here, $object->id, $object->ref and $modulepart are required.
 		//var_dump($modulepart);
-		if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice',
+		if (! in_array($modulepart, array('product'))) {	// Test to remove
-			'supplier_order', 'supplier_proposal', 'shipment', 'contract', 'expensereport', 'ficheinter')))
+			$path = dol_sanitizeFileName(empty($object->ref) ? $object->id : $object->ref);
-		{
-			$path = ($object->ref ? $object->ref : $object->id);
 		}
 	}
 
@@ -6262,10 +6262,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__SUPPLIER_ORDER_DATE_DELIVERY__'] = (isset($object->date_livraison) ? dol_print_date($object->date_livraison, 'day', 0, $outputlangs) : '');
 			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = (isset($object->availability_code) ? ($outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '')) : '');
 
-			$birthday = dol_print_date($object->birth, 'day');
-
 			if (is_object($object) && ($object->element == 'adherent' || $object->element == 'member') && $object->id > 0)
 			{
+				$birthday = (empty($object->birth) ? '': dol_print_date($object->birth, 'day'));
+
 				$substitutionarray['__MEMBER_ID__'] = (isset($object->id) ? $object->id : '');
 				if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
 				$substitutionarray['__MEMBER_FIRSTNAME__'] = (isset($object->firstname) ? $object->firstname : '');
@@ -6660,6 +6660,14 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 			}
 		}
 	}
+	if (!empty($conf->global->ODT_ENABLE_ALL_TAGS_IN_SUBSTITUTIONS)) {
+		// to list all tags in odt template
+		$tags = '';
+		foreach ($substitutionarray as $key => $value) {
+			$tags .= '{' . $key . '} => ' . $value ."\n";
+		}
+		$substitutionarray = array_merge($substitutionarray, array('__ALL_TAGS__' => $tags));
+	}
 }
 
 /**

htdocs/core/lib/product.lib.php

@@ -90,16 +90,6 @@ function product_prepare_head($object)
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$object->id;
-	$head[$h][1] = $langs->trans('Statistics');
-	$head[$h][2] = 'stats';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?showmessage=1&id=".$object->id;
-	$head[$h][1] = $langs->trans('Referers');
-	$head[$h][2] = 'referers';
-	$h++;
-
 	if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
 		global $db;
 
@@ -149,6 +139,16 @@ function product_prepare_head($object)
 		}
 	}
 
+	$head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?showmessage=1&id=".$object->id;
+	$head[$h][1] = $langs->trans('Referers');
+	$head[$h][2] = 'referers';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$object->id;
+	$head[$h][1] = $langs->trans('Statistics');
+	$head[$h][2] = 'stats';
+	$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

htdocs/core/modules/member/doc/doc_generic_member_odt.class.php

@@ -322,11 +322,6 @@ class doc_generic_member_odt extends ModelePDFMember
 
 				$tmparray = array_merge($array_member, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
-				$tags = '';
-				foreach ($tmparray as $key => $value) {
-					$tags .= '{' . $key . '} => ' . $value ."\n";
-				}
-				$tmparray = array_merge($tmparray, array('__ALL_TAGS__' => $tags));
 				// Call the ODTSubstitution hook
 				$parameters = array(
 					'file'=>$file,
@@ -352,12 +347,10 @@ class doc_generic_member_odt extends ModelePDFMember
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
+				foreach ($tmparray as $key=>$value) {
-				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
+					} catch (OdfException $e) {
-					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}

htdocs/core/tpl/admin_extrafields_add.tpl.php

@@ -153,7 +153,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><input type="text" name="attrname" id="attrname"  size="10" value="<?php echo GETPOST('attrname', 'alpha'); ?>"> <span class="opacitymedium">(<?php echo $langs->trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>)</span></td></tr>
 <!-- Type -->
 <tr><td class="fieldrequired"><?php echo $langs->trans("Type"); ?></td><td class="valeur">
-<?php print $form->selectarray('type', $type2label, GETPOST('type', 'alpha')); ?>
+<?php print $form->selectarray('type', $type2label, GETPOST('type', 'alpha'), 0, 0, 0, '', 0, 0, 0, '', '', 1); ?>
 </td></tr>
 <!-- Size -->
 <tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size', 'alpha') ?GETPOST('size', 'alpha') : ''); ?>"></td></tr>

htdocs/core/tpl/admin_extrafields_edit.tpl.php

@@ -205,7 +205,8 @@ $typewecanchangeinto = array(
 	'mail'=>array('varchar', 'phone', 'mail', 'url', 'select'),
 	'url'=>array('varchar', 'phone', 'mail', 'url', 'select'),
 	'phone'=>array('varchar', 'phone', 'mail', 'url', 'select'),
-	'select'=>array('varchar', 'phone', 'mail', 'url', 'select')
+	'select'=>array('varchar', 'phone', 'mail', 'url', 'select'),
+	'date'=>array('date', 'datetime')
 );
 /* Disabled because text is text on several lines, when varchar is text on 1 line, we should not be able to convert
 if ($size <= 255 && in_array($type, array('text', 'html'))) {
@@ -224,6 +225,7 @@ if (in_array($type, array_keys($typewecanchangeinto)))
 		else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
 	}
 	print '</select>';
+	print ajax_combobox('type');
 } else {
 	print $type2label[$type];
 	print '<input type="hidden" name="type" id="type" value="'.$type.'">';

htdocs/core/tpl/notes.tpl.php

@@ -88,20 +88,22 @@ else $typeofdata = 'textarea:12:95%';
 print '<!-- BEGIN PHP TEMPLATE NOTES -->'."\n";
 print '<div class="tagtable border table-border tableforfield centpercent">'."\n";
 print '<div class="tagtr table-border-row">'."\n";
-print '<div class="tagtd tagtdnote tdtop sensiblehtmlcontent table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
+$editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_public);
+print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
 print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0);
 print '</div>'."\n";
-print '<div class="tagtd wordbreak table-val-border-col sensiblehtmlcontent">'."\n";
+print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";
 print $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam, 1)."\n";
 print '</div>'."\n";
 print '</div>'."\n";
 if (empty($user->socid)) {
 	// Private notes (always hidden to external users)
 	print '<div class="tagtr table-border-row">'."\n";
-	print '<div class="tagtd tagtdnote tdtop sensiblehtmlcontent table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
+	$editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_private);
+	print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
 	print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0);
 	print '</div>'."\n";
-	print '<div class="tagtd wordbreak table-val-border-col sensiblehtmlcontent">'."\n";
+	print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";
 	print $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam, 1);
 	print '</div>'."\n";
 	print '</div>'."\n";

htdocs/expedition/card.php

@@ -1047,7 +1047,7 @@ if ($action == 'create')
 				$i++;
 			}
 			print '});
-	            jQuery("#autoreset").click(function() {';
+	            jQuery("#autoreset").click(function() { console.log("Reset values to 0"); ';
 			$i = 0;
 			while ($i < $numAsked)
 			{
@@ -1075,12 +1075,12 @@ if ($action == 'create')
 				print '<td class="center">'.$langs->trans("QtyToShip");
 				if (empty($conf->productbatch->enabled))
 				{
-					print '<br><a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
+					print '<br><a href="#" id="autofill" class="opacitymedium link cursor cursorpointer">'.$langs->trans("Fill").'</a>';
 					print ' / ';
 				} else {
 					print '<br>';
 				}
-				print '<a href="#" id="autoreset">'.$langs->trans("Reset").'</a>';
+				print '<span id="autoreset" class="opacitymedium link cursor cursorpointer">'.img_picto($langs->trans("Reset"), 'eraser').'</span>';
 				print '</td>';
 				if (!empty($conf->stock->enabled))
 				{
@@ -1114,7 +1114,7 @@ if ($action == 'create')
 					if (!empty($line->date_start)) $type = 1;
 					if (!empty($line->date_end)) $type = 1;
 
-					print '<!-- line '.$line->rowid.' for product -->'."\n";
+					print '<!-- line '.$line->id.' for product -->'."\n";
 					print '<tr class="oddeven">'."\n";
 
 					// Product label
@@ -1125,13 +1125,16 @@ if ($action == 'create')
 						//var_dump($product->stock_warehouse[1]);
 
 						print '<td>';
-						print '<a name="'.$line->rowid.'"></a>'; // ancre pour retourner sur la ligne
+						print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
 
 						// Show product and description
 						$product_static->type = $line->fk_product_type;
 						$product_static->id = $line->fk_product;
 						$product_static->ref = $line->ref;
+						$product_static->status = $line->product_tosell;
+						$product_static->status_buy = $line->product_tobuy;
 						$product_static->status_batch = $line->product_tobatch;
+
 						$text = $product_static->getNomUrl(1);
 						$text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
 						$description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($line->desc));
@@ -2048,7 +2051,7 @@ if ($action == 'create')
 			$sql .= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
 			$sql .= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
 			//if ($conf->delivery_note->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
-			$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
+			$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch';
 			$sql .= ', p.description as product_desc';
 			$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
 			$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
@@ -2075,7 +2078,10 @@ if ($action == 'create')
 					if ($obj)
 					{
 						// $obj->rowid is rowid in $origin."det" table
-						$alreadysent[$obj->rowid][$obj->shipmentline_id] = array('shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped, 'date_valid'=>$db->jdate($obj->date_valid), 'date_delivery'=>$db->jdate($obj->date_delivery));
+						$alreadysent[$obj->rowid][$obj->shipmentline_id] = array(
+							'shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped,
+							'product_tosell'=>$obj->product_tosell, 'product_tobuy'=>$obj->product_tobuy, 'product_tobatch'=>$obj->product_tobatch,
+							'date_valid'=>$db->jdate($obj->date_valid), 'date_delivery'=>$db->jdate($obj->date_delivery));
 					}
 					$i++;
 				}
@@ -2084,6 +2090,7 @@ if ($action == 'create')
 		}
 
 		print '<tbody>';
+
 		// Loop on each product to send/sent
 		for ($i = 0; $i < $num_prod; $i++)
 		{
@@ -2119,6 +2126,8 @@ if ($action == 'create')
 					$product_static->type = $lines[$i]->fk_product_type;
 					$product_static->id = $lines[$i]->fk_product;
 					$product_static->ref = $lines[$i]->ref;
+					$product_static->status = $lines[$i]->product_tosell;
+					$product_static->status_buy = $lines[$i]->product_tobuy;
 					$product_static->status_batch = $lines[$i]->product_tobatch;
 
 					$product_static->weight = $lines[$i]->weight;

htdocs/expedition/class/expedition.class.php

@@ -619,10 +619,8 @@ class Expedition extends CommonObject
 				// Tracking url
 				$this->getUrlTrackingStatus($obj->tracking_number);
 
-				/*
+				// Thirdparty
-				 * Thirdparty
+				$result = $this->fetch_thirdparty();	// TODO Remove this
-				 */
-				$result = $this->fetch_thirdparty();
 
 				// Retrieve extrafields
 				$this->fetch_optionals();
@@ -919,6 +917,7 @@ class Expedition extends CommonObject
 
 		$line->entrepot_id = $entrepot_id;
 		$line->origin_line_id = $id;
+		$line->fk_origin_line = $id;
 		$line->qty = $qty;
 
 		$orderline = new OrderLine($this->db);
@@ -931,34 +930,40 @@ class Expedition extends CommonObject
 		{
 			$fk_product = $orderline->fk_product;
 
-			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS))
+			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS)) {
-			{
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
 				return -1;
 			}
 
-			if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
+			if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT) {
-			{
-				// Check must be done for stock of product into warehouse if $entrepot_id defined
 				$product = new Product($this->db);
-				$result = $product->fetch($fk_product);
+				$product->fetch($fk_product);
 
+				// Check must be done for stock of product into warehouse if $entrepot_id defined
 				if ($entrepot_id > 0) {
 					$product->load_stock('warehouseopen');
 					$product_stock = $product->stock_warehouse[$entrepot_id]->real;
-				} else $product_stock = $product->stock_reel;
+				} else {
+					$product_stock = $product->stock_reel;
+				}
 
 				$product_type = $product->type;
-				if ($product_type == 0 && $product_stock < $qty)
+				if ($product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-				{
+					$isavirtualproduct = ($product->hasFatherOrChild(1) > 0);
+					// The product is qualified for a check of quantity (must be enough in stock to be added into shipment).
+					if (!$isavirtualproduct || empty($conf->global->PRODUIT_SOUSPRODUITS) || ($isavirtualproduct && empty($conf->global->STOCK_EXCLUDE_VIRTUAL_PRODUCTS))) {  // If STOCK_EXCLUDE_VIRTUAL_PRODUCTS is set, we do not manage stock for kits/virtual products.
+						if ($product_stock < $qty) {
 							$langs->load("errors");
 							$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
+							$this->errorhidden = 'ErrorStockIsNotEnoughToAddProductOnShipment';
 							$this->db->rollback();
 							return -3;
 						}
 					}
 				}
+			}
+		}
 
 		// If product need a batch number, we should not have called this function but addline_batch instead.
 		if (!empty($conf->productbatch->enabled) && !empty($orderline->fk_product) && !empty($orderline->product_tobatch))
@@ -1576,7 +1581,7 @@ class Expedition extends CommonObject
 		$sql .= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc, cd.rang";
 		$sql .= ", ed.rowid as line_id, ed.qty as qty_shipped, ed.fk_origin_line, ed.fk_entrepot";
 		$sql .= ", p.ref as product_ref, p.label as product_label, p.fk_product_type";
-		$sql .= ", p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
+		$sql .= ", p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch";
 		$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
 		$sql .= " WHERE ed.fk_expedition = ".$this->id;
@@ -1638,6 +1643,8 @@ class Expedition extends CommonObject
 				$line->product_ref = $obj->product_ref;
 				$line->product_label = $obj->product_label;
 				$line->libelle        	= $obj->product_label; // TODO deprecated
+				$line->product_tosell = $obj->product_tosell;
+				$line->product_tobuy = $obj->product_tobuy;
 				$line->product_tobatch = $obj->product_tobatch;
 				$line->label = $obj->custom_label;
 				$line->description    	= $obj->description;

htdocs/fourn/class/fournisseur.commande.class.php

@@ -9,7 +9,7 @@
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Ferran Marcet         	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -121,7 +121,7 @@ class CommandeFournisseur extends CommonOrder
 	public $date_livraison;
 
 	/**
-	 * Delivery date
+	 *  @var int Date expected for delivery
 	 */
 	public $delivery_date;
 
@@ -132,16 +132,6 @@ class CommandeFournisseur extends CommonOrder
 	public $total_ttc;
 	public $source;
 
-	/**
-	 * @deprecated
-	 * @see $note_private, $note_public
-	 */
-	public $note;
-
-	public $note_private;
-	public $note_public;
-	public $model_pdf;
-
 	/**
 	 * @var int ID
 	 */
@@ -3107,8 +3097,11 @@ 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');
+		if (empty($this->delivery_date)) {
-		else $text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_delivery, 'day');
+			$text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+		} else {
+			$text = $langs->trans("DeliveryDate").' '.dol_print_date($this->delivery_date, 'day');
+		}
 		$text .= ' '.($conf->commande->fournisseur->warning_delay > 0 ? '+' : '-').' '.round(abs($conf->commande->fournisseur->warning_delay) / 3600 / 24, 1).' '.$langs->trans("days").' < '.$langs->trans("Today");
 
 		return $text;

htdocs/fourn/class/fournisseur.product.class.php

@@ -126,6 +126,7 @@ class ProductFournisseur extends Product
 	 */
 	public $supplier_fk_barcode_type;
 
+  
 	/**
 	 *	Constructor
 	 *
@@ -140,8 +141,6 @@ class ProductFournisseur extends Product
 		$this->reputations = array('-1'=>'', 'FAVORITE'=>$langs->trans('Favorite'), 'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));
 	}
 
-
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Remove all prices for this couple supplier-product
@@ -675,8 +674,8 @@ class ProductFournisseur extends Product
 				}
 
 				if ($conf->barcode->enabled) {
-					$prodfourn->supplier_barcode = $record["barcode"];
+					$prodfourn->barcode = $record["barcode"];
-					$prodfourn->supplier_fk_barcode_type = $record["fk_barcode_type"];
+					$prodfourn->fk_barcode_type = $record["fk_barcode_type"];
 				}
 
 				if (!empty($conf->dynamicprices->enabled) && !empty($prodfourn->fk_supplier_price_expression)) {

htdocs/holiday/document.php

@@ -64,7 +64,7 @@ if (!$sortfield) $sortfield = "position_name";
 $object = new Holiday($db);
 $object->fetch($id, $ref);
 
-$upload_dir = $conf->holiday->dir_output.'/'.get_exdir($object->id, 0, 0, 0, $object, 'holiday').dol_sanitizeFileName($object->ref);
+$upload_dir = $conf->holiday->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, '');
 $modulepart = 'holiday';
 
 

htdocs/install/mysql/migration/12.0.0-13.0.0.sql

@@ -107,6 +107,11 @@ ALTER TABLE llx_user DROP COLUMN whatsapp;
 ALTER TABLE llx_user ADD COLUMN datestartvalidity datetime;
 ALTER TABLE llx_user ADD COLUMN dateendvalidity   datetime;
 
+ALTER TABLE llx_user ADD COLUMN idpers1 varchar(128);
+ALTER TABLE llx_user ADD COLUMN idpers2	varchar(128);
+ALTER TABLE llx_user ADD COLUMN idpers3	varchar(128);
+
+
 -- Intracomm Report
 CREATE TABLE llx_c_transport_mode (
   rowid     integer AUTO_INCREMENT PRIMARY KEY,

htdocs/install/mysql/tables/llx_user.sql

@@ -25,6 +25,8 @@ create table llx_user
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
   ref_int			varchar(50),				-- reference into an internal system (deprecated)
 
+  admin             smallint DEFAULT 0,			-- user has admin profile
+
   employee          tinyint        DEFAULT 1,	-- 1 if user is an employee
   fk_establishment  integer        DEFAULT 0,
 
@@ -55,22 +57,24 @@ create table llx_user
   personal_mobile   varchar(20),
   email             varchar(255),
   personal_email    varchar(255),
+  signature         text DEFAULT NULL,
 
   socialnetworks    text DEFAULT NULL,       -- json with socialnetworks
 
-  signature         text DEFAULT NULL,
+  --module_comm       smallint DEFAULT 1,
-  admin             smallint DEFAULT 0,
+  --module_compta     smallint DEFAULT 1,
   
-  module_comm       smallint DEFAULT 1,
+  fk_soc			integer,					-- id thirdparty if user linked to a company (external user)
-  module_compta     smallint DEFAULT 1,
+  fk_socpeople      integer,					-- id contact origin if user linked to a contact
-  
+  fk_member         integer,					-- if member if suer linked to a member
-  fk_soc			integer,
+  fk_user           integer,					-- Supervisor, hierarchic parent
-  fk_socpeople      integer,
-  fk_member         integer,
-  fk_user           integer,					-- Hierarchic parent
   fk_user_expense_validator           integer,
   fk_user_holiday_validator           integer,
   
+  idpers1			varchar(128),
+  idpers2			varchar(128),
+  idpers3			varchar(128),
+  
   note_public		text,
   note              text DEFAULT NULL,
   model_pdf         varchar(255) DEFAULT NULL,
@@ -103,5 +107,5 @@ create table llx_user
   import_key        varchar(14),				-- import key
   default_range     integer,
   default_c_exp_tax_cat     integer,
-  fk_warehouse     integer
+  fk_warehouse      integer						-- default warehouse os user
 )ENGINE=innodb;

htdocs/langs/am_ET/admin.lang

@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+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>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+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=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1282,7 +1321,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1523,7 +1562,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1612,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1639,11 +1680,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1794,7 +1835,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1904,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2000,8 @@ 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
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2016,7 @@ 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)
+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
@@ -1996,13 +2038,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+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
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+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.
@@ -2029,4 +2073,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+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.

htdocs/langs/am_ET/ecm.lang

@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsBy=Documents linked to %s
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup

htdocs/langs/am_ET/install.lang

@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 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.
-PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportSessions=This PHP supports sessions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
 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.

htdocs/langs/am_ET/intracommreport.lang

@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode

htdocs/langs/am_ET/members.lang

@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
+MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form

htdocs/langs/am_ET/products.lang

@@ -108,20 +108,20 @@ 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 virtual products (kits)
+AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Virtual products
+AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes

htdocs/langs/am_ET/recruitment.lang

@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
+PositionToBeFilled=Job position
-PositionsToBeFilled=Job offers to be filled
+PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job offers to be filled
+ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job offers to be filled
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+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 candidature
+NewCandidature=New application
-ListOfCandidatures=List of candidatures
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
+AnswerCandidature=Application answer
-YourCandidature=Your candidature
+YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+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)

htdocs/langs/am_ET/stocks.lang

@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+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
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in 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)
+UpdateByScaningLot=Update by scan (lot|serial barcode)

htdocs/langs/am_ET/suppliers.lang

@@ -38,6 +38,7 @@ 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

htdocs/langs/ar_EG/suppliers.lang

@@ -42,5 +42,4 @@ NotTheGoodQualitySupplier=جودة منخفضة
 ReputationForThisProduct=سمعة
 BuyerName=اسم المشتري
 AllProductServicePrices=أسعار جميع المنتجات / الخدمات
-AllProductReferencesOfSupplier=جميع مراجع المنتج / الخدمة للمورد
 BuyingPriceNumShort=أسعار المورد

htdocs/langs/ar_SA/admin.lang

@@ -37,6 +37,8 @@ UnlockNewSessions=إزالة قفل الإتصال
 YourSession=الجلسة الخاصة بك
 Sessions=Users Sessions
 WebUserGroup=خادم الويب المستخدم / المجموعة
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
 DBSortingCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع COMPANY_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 UseSearchToSelectContactTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع CONTACT_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=الجافا سكربت معطل
 UsePreviewTabs=إستخدم زر المعاينة
 ShowPreview=آظهر المعاينة
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=المعاينة غير متاحة
 ThemeCurrentlyActive=الثيم النشط حالياً
 CurrentTimeZone=حسب توقيت خادم البي إتش بي
@@ -271,7 +274,7 @@ NoticePeriod=فترة إشعار
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+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>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+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=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=انقر للاتصال
 Module58Desc=ClickToDial التكامل
-Module59Name=Bookmark4u
-Module59Desc=إضافة مهمة لتوليد Bookmark4u الحساب من حساب Dolibarr
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=المداخلات
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=استطلاع للرأي، أو مسح التصويت
@@ -671,7 +677,7 @@ Module63000Name=مصادر
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=قراءة الفواتير
 Permission12=إنشاء / تعديل فواتير العملاء
-Permission13=تعديل الفواتير
+Permission13=Invalidate customer invoices
 Permission14=التحقق من صحة الفواتير
 Permission15=ارسال الفواتير عن طريق البريد الإلكتروني
 Permission16=إنشاء مدفوعات الفواتير العملاء
@@ -688,6 +694,7 @@ Permission32=إنشاء / تعديل المنتجات
 Permission34=حذف المنتجات
 Permission36=انظر / إدارة المنتجات المخفية
 Permission38=منتجات التصدير
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=قراءة التدخلات
 Permission62=إنشاء / تعديل التدخلات
 Permission64=حذف التدخلات
 Permission67=تصدير التدخلات
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=قراءة الأعضاء
 Permission72=إنشاء / تعديل أعضاء
 Permission74=حذف أعضاء
@@ -718,6 +728,7 @@ Permission95=قراءة تقارير
 Permission101=قراءة الإرسال
 Permission102=إنشاء / تعديل الإرسال
 Permission104=صحة الإرسال
+Permission105=Send sendings by email
 Permission106=sendings التصدير
 Permission109=حذف الإرسال
 Permission111=قراءة الحسابات المالية
@@ -825,10 +836,11 @@ Permission402=إنشاء / تعديل الخصومات
 Permission403=تحقق من الخصومات
 Permission404=حذف خصومات
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=رواتب التصدير
+Permission517=Read payments of salaries of everybody
+Permission519=رواتب التصدير
 Permission520=قراءة القروض
 Permission522=إنشاء / تعديل القروض
 Permission524=حذف القروض
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=ونتيجة للحصول على التصدير
 Permission1202=إنشاء / تعديل للتصدير
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=ادارة الدمار الواردات الخارجية الب
 Permission1321=تصدير العملاء والفواتير والمدفوعات والصفات
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=قراءة مهمة مجدولة
 Permission23002=إنشاء / تحديث المجدولة وظيفة
 Permission23003=حذف مهمة مجدولة
 Permission23004=تنفيذ مهمة مجدولة
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=قراءة المعاملات
 Permission50202=استيراد المعاملات
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=الإعداد المحفوظة
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=العلامة التي يستخدمها التقصير إذ
 LabelOnDocuments=علامة على وثائق
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=في نهاية الشهر
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=اسم المتصفح
 BrowserOS=متصفح OS
 ListOfSecurityEvents=قائمة الأحداث الأمنية Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=استيراد MySQL
-ForcedToByAModule= هذه القاعدة <b>%s</b> الى جانب تفعيل وحدة
+ForcedToByAModule=هذه القاعدة <b>%s</b> الى جانب تفعيل وحدة
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1282,7 +1321,7 @@ GetBarCode=الحصول على الباركود
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=عودة كلمة سر ولدت الداخلية وفقا لخوارزمية Dolibarr : 8 أحرف مشتركة تتضمن الأرقام والحروف في حرف صغير.
+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=ترجع كلمة المرور الخاصة بك وفقا لتكوين المعرفة شخصيا.
 SetupPerso=وفقا لتكوين الخاصة بك
@@ -1523,7 +1562,9 @@ LDAPDescValues=مثال قيم تهدف <b>لOpenLDAP</b> مع مخططات بع
 ForANonAnonymousAccess=لصحتها accès (لكتابة الحصول على سبيل المثال)
 PerfDolibarr=الإعداد أداء / تحسين تقرير
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=مخبأ تطبيقي
 MemcachedNotAvailable=لم يتم العثور على مخبأ تطبيقي. يمكنك تحسين الأداء عن طريق تثبيت أعطها مخبأ خادم وحدة قادرة على استخدام هذا الخادم ذاكرة التخزين المؤقت. <br> مزيد من المعلومات هنا <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN.</a> <br> لاحظ أن الكثير من مزود استضافة المواقع لا توفر مثل هذا الخادم ذاكرة التخزين المؤقت.
 MemcachedModuleAvailableButNotSetup=وحدة أعطها لمخبأ تطبيقي وجدت ولكن الإعداد من وحدة ليست كاملة.
@@ -1571,9 +1612,9 @@ SyslogLevel=المستوى
 SyslogFilename=اسم الملف ومسار
 YouCanUseDOL_DATA_ROOT=يمكنك استخدام DOL_DATA_ROOT / dolibarr.log لملف الدخول في Dolibarr "وثائق" دليل. يمكنك أن تحدد مسارا مختلفا لتخزين هذا الملف.
 ErrorUnknownSyslogConstant=ثابت %s ليس ثابت سيسلوغ معروفة
-OnlyWindowsLOG_USER=نوافذ يعتمد فقط LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=وحدة الإعداد للتبرع
@@ -1639,11 +1680,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=حذف من القائمة
+Menu=Menu
 Menus=القوائم
 TreeMenuPersonalized=شخصي قوائم
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=قائمة جديدة
-Menu=اختيار قائمة
 MenuHandler=قائمة مناول
 MenuModule=مصدر في وحدة
 HideUnauthorizedMenu= إخفاء القوائم غير المصرح به (الرمادي)
@@ -1794,7 +1835,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=يشمل المسار (المحدد في متغير%s)
 ExpenseReportsSetup=إعداد تقارير المصروفات وحدة
 TemplatePDFExpenseReports=قوالب المستند لتوليد حساب ثيقة تقرير
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=تم تفعيل أي وحدة قادرة على إدارة زيادة المخزون التلقائي. وسوف يتم زيادة الأسهم على الإدخال اليدوي فقط.
@@ -1864,7 +1904,7 @@ MailToSendReception=Receptions
 MailToThirdparty=أطراف ثالثة
 MailToMember=أعضاء
 MailToUser=المستخدمين
-MailToProject=Projects page
+MailToProject=مشاريع
 MailToTicket=Tickets
 ByDefaultInList=تظهر بشكل افتراضي على عرض القائمة
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2000,8 @@ 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
 FormatZip=الرمز البريدي
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2016,7 @@ 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)
+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
@@ -1996,13 +2038,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+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
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+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.
@@ -2029,4 +2073,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+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.

htdocs/langs/ar_SA/ecm.lang

@@ -23,19 +23,7 @@ ECMSearchByKeywords=بحث الكلمات الرئيسية
 ECMSearchByEntity=بحث عن وجوه
 ECMSectionOfDocuments=أدلة وثائق
 ECMTypeAuto=التلقائي
-ECMDocsBySocialContributions=المستندات المرتبطة بالضرائب الاجتماعية أو المالية
+ECMDocsBy=Documents linked to %s
-ECMDocsByThirdParties=وثائق مرتبطة أطراف ثالثة
-ECMDocsByProposals=وثائق مرتبطة مقترحات
-ECMDocsByOrders=وثائق مرتبطة أوامر العملاء
-ECMDocsByContracts=وثائق مرتبطة بعقود
-ECMDocsByInvoices=وثائق مرتبطة عملاء الفواتير
-ECMDocsByProducts=الوثائق المرتبطة بالمنتجات
-ECMDocsByProjects=المستندات المرتبطة بالمشاريع
-ECMDocsByUsers=وثائق مرتبطة المستخدمين
-ECMDocsByInterventions=وثائق مرتبطة بالتدخلات
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=لا الدليل
 ShowECMSection=وتظهر الدليل
 DeleteSection=إزالة الدليل
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup

htdocs/langs/ar_SA/install.lang

@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=ملف الإعداد <b>%s</b> قابل للكتابة.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=يدعم هذا الـ PHP ميزة الجلسات الزمنية.
 PHPSupportPOSTGETOk=يدعم هذا الـ PHP وظائف POST و GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportSessions=يدعم هذا الـ PHP ميزة الجلسات الزمنية.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=تم إعداد الجلسة الزمنية للذاكرة في  PHP الى <b>%s</b> . من المفترض ان تكون كافية.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.

htdocs/langs/ar_SA/intracommreport.lang

@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=قائمة
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode

htdocs/langs/ar_SA/members.lang

@@ -19,14 +19,12 @@ MembersCards=أعضاء طباعة البطاقات
 MembersList=قائمة الأعضاء
 MembersListToValid=قائمة مشاريع أعضاء (ينبغي التأكد من صحة)
 MembersListValid=قائمة أعضاء صالحة
-MembersListUpToDate=قائمة الأعضاء صالحة لغاية تاريخ الاكتتاب
+MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=قائمة صحيحة مع أعضاء من تاريخ الاكتتاب
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=قائمة الأعضاء المؤهلين
 MenuMembersToValidate=أعضاء مشروع
 MenuMembersValidated=صادق أعضاء
-MenuMembersUpToDate=حتى الآن من أعضاء
-MenuMembersNotUpToDate=وحتى الآن من أصل أعضاء
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=أعضاء مع اشتراك لتلقي
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=تاريخ الاكتتاب
 DateEndSubscription=تاريخ انتهاء الاكتتاب
 EndSubscription=انتهاء الاكتتاب
 SubscriptionId=الاكتتاب معرف
+WithoutSubscription=Without subscription
 MemberId=عضو المعرف
 NewMember=عضو جديد
 MemberType=عضو نوع
@@ -81,7 +80,7 @@ DeleteType=حذف
 VoteAllowed=يسمح التصويت
 Physical=المادية
 Moral=الأخلاقية
-MorPhy=طبيعة
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاط
 MembersStatisticsByTown=أعضاء إحصاءات بلدة
 MembersStatisticsByRegion=إحصائيات الأعضاء حسب المنطقة
 NbOfMembers=عدد الأعضاء
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=العثور على أي أعضاء التحقق من صحة
 MembersByCountryDesc=هذه الشاشة تظهر لك إحصاءات عن أعضاء من الدول. لكن الرسم يعتمد على خدمة غوغل الرسم البياني على الإنترنت ويتوفر فقط إذا كان على اتصال بالإنترنت ويعمل.
 MembersByStateDesc=هذه الشاشة تظهر لك إحصاءات عن أفراد من قبل الدولة / المحافظات / كانتون.
@@ -176,6 +177,7 @@ MenuMembersStats=إحصائيات
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=معلومات علنية
 NewMemberbyWeb=وأضاف عضو جديد. تنتظر الموافقة
 NewMemberForm=الأعضاء الجدد في شكل

htdocs/langs/ar_SA/products.lang

@@ -108,20 +108,20 @@ 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 virtual products (kits)
+AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Virtual products
+AssociatedProducts=Kits
-AssociatedProductsNumber=عدد المنتجات التي تنتج هذا المنتج الإفتراضي
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=عدد منتج التعبئة الاب
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=إذا كان 0، هذا المنتج ليس منتج إفتراضي
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=إذا كان 0، لا يتم استخدام هذا المنتج من قبل أي منتج إفتراضي
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=فلتر الكلمة المقتاحية
 CategoryFilter=فلتر التصنيف
 ProductToAddSearch= إبحث عن منتج لإضافتة
 NoMatchFound=لا يوجد نتائج متطابقة
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=قائمة من المنتجات / الخدمات الإفتراضية مع هذا المنتج كعنصر مكون
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=واحد من اختيار المنتج الأم الحالية المنتج
 DeleteProduct=حذف منتج / خدمة
 ConfirmDeleteProduct=هل أنت متأكد من حذف هذا المنتج / الخدمة؟
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=القيم العالمية المتاحة:
 PriceMode=وضع السعر
 PriceNumeric=عدد
 DefaultPrice=سعر افتراضي
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=زيادة / نقصان الأسهم على التغيير الأم
 ComposedProduct=Child products
 MinSupplierPrice=الحد الأدنى من سعر الشراء
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes

htdocs/langs/ar_SA/recruitment.lang

@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
+PositionToBeFilled=Job position
-PositionsToBeFilled=Job offers to be filled
+PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job offers to be filled
+ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job offers to be filled
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+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 candidature
+NewCandidature=New application
-ListOfCandidatures=List of candidatures
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
+AnswerCandidature=Application answer
-YourCandidature=Your candidature
+YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+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)

htdocs/langs/ar_SA/stocks.lang

@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=منطقة المستودعات
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=عوضا عن
 LocationSummary=باختصار اسم الموقع
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=أن تأمر
 Replenishment=التجديد
 ReplenishmentOrders=أوامر التجديد
-VirtualDiffersFromPhysical=وفقا للزيادة / نقصان خيارات الأسهم، والمخزون المادي والأسهم الظاهري (الطلبات الحالية المادية +) قد تختلف
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseVirtualStockByDefault=استخدام الأسهم الظاهري افتراضيا، بدلا من المخزون المادي، لميزة تجديد
+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=استخدام الأسهم الظاهري
 UsePhysicalStock=استخدام المخزون المادي
 CurentSelectionMode=وضع التحديد الحالي
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=فئة فلتر
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in 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)
+UpdateByScaningLot=Update by scan (lot|serial barcode)

htdocs/langs/ar_SA/suppliers.lang

@@ -38,6 +38,7 @@ 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

htdocs/langs/az_AZ/admin.lang

@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+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>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+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=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1282,7 +1321,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1523,7 +1562,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1612,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1639,11 +1680,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1794,7 +1835,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1904,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2000,8 @@ 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
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2016,7 @@ 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)
+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
@@ -1996,13 +2038,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+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
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+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.
@@ -2029,4 +2073,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+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.

htdocs/langs/az_AZ/ecm.lang

@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsBy=Documents linked to %s
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup

htdocs/langs/az_AZ/install.lang

@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 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.
-PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportSessions=This PHP supports sessions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
 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.

htdocs/langs/az_AZ/intracommreport.lang

@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode

htdocs/langs/az_AZ/members.lang

@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
+MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form

htdocs/langs/az_AZ/products.lang

@@ -108,20 +108,20 @@ 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 virtual products (kits)
+AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Virtual products
+AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes

htdocs/langs/az_AZ/recruitment.lang

@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
+PositionToBeFilled=Job position
-PositionsToBeFilled=Job offers to be filled
+PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job offers to be filled
+ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job offers to be filled
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+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 candidature
+NewCandidature=New application
-ListOfCandidatures=List of candidatures
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
+AnswerCandidature=Application answer
-YourCandidature=Your candidature
+YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+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)

htdocs/langs/az_AZ/stocks.lang

@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+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
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in 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)
+UpdateByScaningLot=Update by scan (lot|serial barcode)

htdocs/langs/az_AZ/suppliers.lang

@@ -38,6 +38,7 @@ 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

htdocs/langs/bg_BG/admin.lang

@@ -37,6 +37,8 @@ UnlockNewSessions=Разрешаване на свързването
 YourSession=Вашата сесия
 Sessions=Потребителски сесии
 WebUserGroup=Уеб сървър потребител / група
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Изглежда, че вашата PHP конфигурация не позволява изброяване на активни сесии. Директорията, използвана за запазване на сесии (<b> %s </b>), може да е защитена (например от права на операционната система или от директивата PHP open_basedir).
 DBStoringCharset=Кодиране на знаците при съхраняване в базата данни
 DBSortingCharset=Кодиране на знаците при сортиране в базата данни
@@ -71,7 +73,7 @@ DisableJavascriptNote=Забележка: За тестови цели или з
 UseSearchToSelectCompanyTooltip=Също така, ако имате голям брой контрагенти (> 100 000) може да увеличите скоростта като зададете стойност 1 за константата COMPANY_DONOTSEARCH_ANYWHERE в Настройки -> Други настройки. След това търсенето ще бъде ограничено до началото на низ.
 UseSearchToSelectContactTooltip=Също така, ако имате голям брой контакти (> 100 000) може да увеличите скоростта като зададете стойност 1 за константата CONTACT_DONOTSEARCH_ANYWHERE в Настройки -> Други настройки. След това търсенето ще бъде ограничено до началото на низ.
 DelaiedFullListToSelectCompany=Изчаква натискането на клавиш, преди да зареди съдържание в списъка с контрагенти. <br> Това може да увеличи производителността, ако имате голям брой контрагенти, но е по-малко удобно.
-DelaiedFullListToSelectContact=Изчаква натискането на клавиш, преди да зареди съдържание в списъка с контакти. <br> Това може да увеличи производителността, ако имате голям брой контакти, но е по-малко удобно
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Брой знаци предизвикващи търсене: %s
 NumberOfBytes=Брой байтове
 SearchString=Низ за търсене
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=В документ на контраген
 JavascriptDisabled=JavaScript е деактивиран
 UsePreviewTabs=Използвайте разделите за преглед
 ShowPreview=Показване на преглед
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Прегледът не е налице
 ThemeCurrentlyActive=Темата е активна в момента
 CurrentTimeZone=Времева зона на PHP (сървър)
@@ -271,7 +274,7 @@ NoticePeriod=Период на предизвестие
 NewByMonth=Нови на месец
 Emails=Имейли
 EMailsSetup=Настройка за имейл известяване
-EMailsDesc=Тази страница позволява да замените стандартните си PHP параметри за изпращане на имейли. В повечето случаи в Unix / Linux OS, PHP настройката е правилна и тези параметри не са необходими.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Профили за изходяща електронна поща
 EMailsSenderProfileDesc=Може да запазите тази секция празна. Ако въведете имейли тук, те ще бъдат добавени като възможни податели в комбинирания списък, когато пишете нов имейл.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS порт (стойност по подразбиране в php.ini: <b> %s </b>)
@@ -289,6 +292,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_DKIM_ENABLED=Използване на DKIM (DomainKeys Identified Mail) удостоверяване за генериране на подпис на имейл
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Имейл домейн за използване с DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Селектор на DKIM
@@ -438,9 +442,9 @@ 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> например: <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> - idfilter е задължително основен int key <br> - филтърът може да бъде прост тест (например active = 1), за да се покаже само активна стойност <br> Може също да използвате $ID$ във филтъра, който е текущият идентификатор на текущия обект. <br>За да направите SELECT във филтъра, използвайте $SEL$ <br> ако искате да филтрирате по допълнителни полета, използвайте синтаксис extra.fieldcode=...(където кодът на полето е кодът на допълнителното поле) <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br> c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:филтер<br><br> За да имате списъка в зависимост от друг списък: <br> c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Списъкът на стойностите идва от таблица <br> Синтаксис: table_name:label_field:id_field::filter <br> Пример: c_typent:libelle:id::filter <br><br> филтърът може да бъде прост тест (например active = 1), за да се покаже само активна стойност <br> Можете също да използвате $ID$ във филтъра, който е текущият идентификатор на текущия обект <br> За да направите SELECT във филтъра, използвайте $SEL$ <br> ако искате да филтрирате по допълнителни полета, използвайте синтаксис extra.fieldcode=...(където кодът на полето е кодът на екстра полето) <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br>c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:filter<br><br> За да имате списъка в зависимост от друг списък: <br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Параметрите трябва да са ObjectName:Classpath<br>Синтаксис: ObjectName:Classpath<br>Примери: <br> Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Оставете празно за обикновен разделител<br>Посочете стойност 1 за разделител, който се свива (отворен по подразбиране за нова сесия, а след това състоянието се запазва за всяка потребителска сесия)<br>Посочете стойност 2 за разделител, който се свива (свит по подразбиране за нова сесия, а след това състоянието се запазва за всяка потребителска сесия).
 LibraryToBuildPDF=Използвана библиотека за създаване на PDF файлове
 LocalTaxDesc=Някои държави могат да прилагат два или три данъка към всеки ред във фактурата. Ако случаят е такъв, изберете вида на втория и третия данък и съответната данъчна ставка. Възможен тип са:<br>1: местен данък върху продукти и услуги без ДДС (местния данък се изчислява върху сумата без данък)<br>2: местен данък върху продукти и услуги с ДДС (местният данък се изчислява върху сумата + основния данък)<br>3: местен данък върху продукти без ДДС (местният данък се изчислява върху сумата без данък)<br>4: местен данък върху продукти с ДДС (местният данък се изчислява върху сумата + основния данък)<br>5: местен данък върху услуги без ДДС (местният данък се изчислява върху сумата без данък)<br>6: местен данък върху услуги с ДДС (местният данък се изчислява върху сумата + основния данък)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s, последвано от съкрате
 ModuleCompanyCodeSupplierDigitaria=%s, последвано от съкратеното име на доставчика според броя на знаци: %s за счетоводния код на доставчика.
 Use3StepsApproval=По подразбиране поръчките за покупки трябва да бъдат създадени и одобрени от двама различни потребители (една стъпка / потребител за създаване и друга стъпка / потребител за одобрение. Обърнете внимание, че ако потребителят има разрешение да създава и одобрява, една стъпка / потребител ще бъде достатъчно). С тази опция може да поискате да въведете трета стъпка / потребител за одобрение, ако сумата е по-висока от определена стойност (така ще са необходими 3 стъпки: 1 = валидиране, 2 = първо одобрение и 3 = второ одобрение, ако количеството е достатъчно).<br> Оставете това поле празно, ако едно одобрение (в 2 стъпки) е достатъчно или посочете много ниска стойност (например: 0,1), за да се изисква винаги второ одобрение (в 3 стъпки).
 UseDoubleApproval=Използване на одобрение в 3 стъпки, когато сумата (без данък) е по-голяма от...
-WarningPHPMail=ВНИМАНИЕ: За предпочитане е да настроите изпращането на имейли,  да използва имейл сървъра на вашия доставчик, вместо настройката по подразбиране. Някои доставчици на електронна поща (като Yahoo) не позволяват да изпращате имейл от друг сървър, освен от собствения им сървър. Текущата настройка използва сървъра на приложението за изпращане на имейли, а не на сървъра на вашия доставчик на електронна поща, така че някои получатели (съвместими с ограничителния DMARC протокол), ще попитат вашия доставчик на електронна поща дали могат да приемат имейлът ви, а някои доставчици на електронна поща (като Yahoo) ще отговорят "не", защото сървърът не е техен, така че някои от изпратените имейли може да не бъдат приети (бъдете внимателни и с квотата за изпращане на вашия имейл доставчик).<br>Ако вашият доставчик на имейл (като Yahoo) има това ограничение, трябва да промените настройката и да изберете другия метод "SMTP сървър" и да въведете SMTP сървъра и идентификационните данни, предоставени от вашия доставчик на електронна поща.
+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=Ако вашият SMTP доставчик трябва да ограничи имейл клиента до някои IP адреси (много рядко), това е IP адресът на потребителския агент за поща (MUA) за вашето ERP CRM приложение: <strong>%s</strong> .
-WarningPHPMailSPF=Ако името на домейна във вашият имейл адрес за изпращане е защитен от SPF (попитайте вашия имейл доставчик), то трябва да включите следните IP адреси в SPF записа на DNS на вашия домейн: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Кликнете, за да се покаже описание
 DependsOn=Този модул се нуждае от модул(и)
 RequiredBy=Този модул изисква модул(и)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Интегриране на система ClickToDial (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Добавяне на функция за генериране на Bookmark4u профил от Dolibarr профил
 Module60Name=Стикери
 Module60Desc=Управление на стикери
 Module70Name=Интервенции
@@ -656,7 +662,7 @@ Module50200Desc=Предлага на клиентите PayPal страница
 Module50300Name=Stripe
 Module50300Desc=Предлага на клиентите Stripe страница за онлайн плащане (чрез кредитни / дебитни карти). Позволява на клиентите да извършват необходими плащания или плащания, свързани с определен Dolibarr обект (фактура, поръчка и т.н.)
 Module50400Name=Счетоводство (двойно записване)
-Module50400Desc=Управление на счетоводство (двойни вписвания, поддържат се общи и спомагателни счетоводни книги). Експортиране на счетоводната книга в други формати за счетоводен софтуер.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Директен печат (без отваряне на документи), чрез използване на Cups IPP интерфейс (Принтерът трябва да се вижда от сървъра, a CUPS трябва да бъде инсталиран на сървъра).
 Module55000Name=Анкети, проучвания и гласоподаване
@@ -671,7 +677,7 @@ Module63000Name=Ресурси
 Module63000Desc=Управление на ресурси (принтери, коли, стаи, ...) с цел разпределяне по събития
 Permission11=Преглед на фактури за продажба
 Permission12=Създаване / променяне на фактури на продажба
-Permission13=Анулиране на фактури за продажба
+Permission13=Invalidate customer invoices
 Permission14=Валидиране на фактури за продажба
 Permission15=Изпращане на фактури за продажба по имейл
 Permission16=Създаване на плащания по фактури за продажба
@@ -688,6 +694,7 @@ Permission32=Създаване / променяне на продукти
 Permission34=Изтриване на продукти
 Permission36=Преглед / управление на скрити продукти
 Permission38=Експортиране на продукти
+Permission39=Ignore minimum price
 Permission41=Преглед на проекти и задачи (споделени проекти и проекти, в които съм определен за контакт). Въвеждане на отделено време, за служителя или неговите подчинени, по възложени задачи (График)
 Permission42=Създаване / променяне на проекти (споделени проекти и проекти, в които съм определен за контакт). Създаване на задачи и възлагане на проекти и задачи на потребители
 Permission44=Изтриване на проекти (споделени проекти и проекти, в които съм определен за контакт)
@@ -696,6 +703,9 @@ Permission61=Преглед на интервенции
 Permission62=Създаване / променяне на интервенции
 Permission64=Изтриване на интервенции
 Permission67=Експортиране на интервенции
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Преглед на членове
 Permission72=Създаване / променяне на членове
 Permission74=Изтриване на членове
@@ -718,6 +728,7 @@ Permission95=Преглед на справки
 Permission101=Преглед на пратки
 Permission102=Създаване / променяне на пратки
 Permission104=Валидиране на пратки
+Permission105=Send sendings by email
 Permission106=Експортиране на пратки
 Permission109=Изтриване на пратки
 Permission111=Преглед на финансови сметки
@@ -825,10 +836,11 @@ Permission402=Създаване / променяне на отстъпки
 Permission403=Валидиране на отстъпки
 Permission404=Изтриване на отстъпки
 Permission430=Използване на инструменти за отстраняване на грешки
-Permission511=Преглед на плащания на заплати
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Създаване / променяне на плащания на заплати
 Permission514=Изтриване на плащания на заплати
-Permission517=Експортиране на заплати
+Permission517=Read payments of salaries of everybody
+Permission519=Експортиране на заплати
 Permission520=Преглед на кредити
 Permission522=Създаване / променяне на кредити
 Permission524=Изтриване на кредити
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Преглед на спецификации
 Permission651=Създаване / променяне на спецификации
 Permission652=Изтриване на спецификации
@@ -884,7 +899,9 @@ Permission1185=Одобряване на поръчки за покупка
 Permission1186=Поръчка на поръчки за покупка
 Permission1187=Потвърждаване на получаването на поръчка за покупка
 Permission1188=Изтриване на поръчки за покупка
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Одобряване (второ одобрение) на поръчки за покупка
+Permission1191=Export supplier orders and their attributes
 Permission1201=Получаване на резултат с експортирани данни
 Permission1202=Създаване / променяне на експортирани данни
 Permission1231=Преглед на фактури за доставка
@@ -898,6 +915,8 @@ Permission1251=Извършване на масово импортиране н
 Permission1321=Експортиране на фактури за продажба, атрибути и плащания
 Permission1322=Повторно отваряне на платена фактура
 Permission1421=Експортиране на поръчки за продажба и атрибути
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Преглед на действия (събития или задачи), свързани с потребителя (ако е собственик на събитие или му е възложено)
 Permission2402=Създаване / променяне на действия (събития или задачи), свързани с потребителя (ако е собственик на събитие)
 Permission2403=Изтриване на действия (събития или задачи), свързани с потребителя (ако е собственик на събитие)
@@ -932,9 +951,13 @@ Permission23001=Преглед на планирани задачи
 Permission23002=Създаване / променяне на планирани задачи
 Permission23003=Изтриване на планирани задачи
 Permission23004=Стартиране на планирани задачи
-Permission50101=Използване на точка на продажба
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Преглед на транзакции
 Permission50202=Импортиране на транзакции
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Свързване на продукти и фактури със счетоводни сметки
 Permission50411=Преглед на операции в счетоводна книга
 Permission50412=Създаване / променяне на операции в счетоводна книга
@@ -958,6 +981,17 @@ 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
 DictionaryCompanyType=Видове контрагенти
 DictionaryCompanyJuridicalType=Правна форма на контрагенти
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Видове отпуск
 DictionaryOpportunityStatus=Статус на възможността за проект / възможност
 DictionaryExpenseTaxCat=Разходен отчет - Транспортни категории
 DictionaryExpenseTaxRange=Разходен отчет - Обхват на транспортни категории
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Настройката е запазена
 SetupNotSaved=Настройката не е запазена
 BackToModuleList=Назад към списъка с модули
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Име, използвано по подразбиране,
 LabelOnDocuments=Текст в документи
 LabelOrTranslationKey=Име или ключ за превод
 ValueOfConstantKey=Стойност на конфигурационна константа
+ConstantIsOn=Option %s is on
 NbOfDays=Брой дни
 AtEndOfMonth=В края на месеца
 CurrentNext=Текущ/Следващ
@@ -1145,6 +1182,7 @@ InfoWebServer=Относно уеб сървър
 InfoDatabase=Относно база данни
 InfoPHP=Относно PHP
 InfoPerf=Относно производителност
+InfoSecurity=About Security
 BrowserName=Име на браузър
 BrowserOS=ОС на браузър
 ListOfSecurityEvents=Списък на събития относно сигурността в Dolibarr
@@ -1194,7 +1232,8 @@ RestoreDesc=Възстановяването на Dolibarr от архивно
 RestoreDesc2=Възстановете от архивният файл (например zip файл) директорията "documents" в нова Dolibarr инсталация или в "documents" директорията на текущата инсталация (<b>%s</b>).
 RestoreDesc3=Възстановете структурата на базата данни и данните от архивния файл в базата данни на новата Dolibarr инсталация или в базата данни (<b>%s</b>) на настоящата инсталация. Внимание, след като възстановяването приключи, трябва да използвате  потребителско име и парола, които са били налични по време на архивирането / инсталацията, за да се свържете отново.<br>За да възстановите архивирана база данни в тази текущата инсталация, може да използвате следния асистент.
 RestoreMySQL=Импортиране на MySQL
-ForcedToByAModule= Това правило е принудено да <b>%s</b>, чрез активиран модул
+ForcedToByAModule=Това правило е принудено да <b>%s</b>, чрез активиран модул
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Съществуващи архивни файлове
 PreviousArchiveFiles=Съществуващи архивни файлове
 WeekStartOnDay=Първи ден от седмицата
@@ -1282,7 +1321,7 @@ GetBarCode=Получаване на баркод
 NumberingModules=Модели за номериране
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Връщане на парола, генерирана според вътрешния Dolibarr алгоритъм: 8 символа, съдържащи споделени числа и символи с малки букви
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Да не се предлага генерирана парола. Паролата трябва да бъде въведена ръчно.
 PasswordGenerationPerso=Връщане на парола според вашата лично дефинирана конфигурация
 SetupPerso=Според вашата конфигурация
@@ -1523,7 +1562,9 @@ LDAPDescValues=Примерните стойности са предназнач
 ForANonAnonymousAccess=За удостоверен достъп (например за достъп за писане)
 PerfDolibarr=Настройка за производителност / отчет за оптимизация
 YouMayFindPerfAdviceHere=Тази страница предоставя някои проверки или съвети, свързани с производителността.
-NotInstalled=Не е инсталирано, така че вашият сървър не се забавя от това.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Приложим кеш
 MemcachedNotAvailable=Не е намерен приложим кеш. Може да подобрите производителността, чрез инсталиране на кеш сървър Memcached и модул, който може да използва този кеш сървър. <br> Повече информация може да откриете тук <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>. <br> Имайте предвид, че много уеб хостинг доставчици не предоставят такъв кеш сървър.
 MemcachedModuleAvailableButNotSetup=Намерен е модул Memcached за приложим кеш, но настройката на модула не е завършена.
@@ -1571,9 +1612,9 @@ SyslogLevel=Ниво
 SyslogFilename=Име на файла и път
 YouCanUseDOL_DATA_ROOT=Може да използвате DOL_DATA_ROOT/dolibarr.log за регистрационен файл в Dolibarr "documents" директорията. Може да зададете различен път за съхранение на този файл.
 ErrorUnknownSyslogConstant=Константата %s не е известна константа на Syslog
-OnlyWindowsLOG_USER=Windows поддържа само LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Компресиране и архивиране на журнали за грешки (генерирани от модула Журнали за отстраняване на грешки)
-SyslogFileNumberOfSaves=Архивирани журнали
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Конфигурирайте планираната задача за почистване, за да зададете честотата на архивиране на журнала
 ##### Donations #####
 DonationsSetup=Настройка на модула за дарения
@@ -1639,11 +1680,11 @@ StockSetup=Настройка на модул Наличности
 IfYouUsePointOfSaleCheckModule=Ако използвате модула точка за продажби (ПОС), предоставен по подразбиране или чрез външен модул, тази настройка може да бъде игнорирана от вашия ПОС модул. Повечето ПОС модули по подразбиране са разработени да създават веднага фактура, след което да намаляват наличностите, независимо от опциите тук. В случай, че имате нужда или не от автоматично намаляване на наличностите при регистриране на продажба от ПОС проверете и настройката на вашия ПОС модул.
 ##### Menu #####
 MenuDeleted=Менюто е изтрито
+Menu=Menu
 Menus=Менюта
 TreeMenuPersonalized=Персонализирани менюта
 NotTopTreeMenuPersonalized=Персонализирани менюта, които не са свързани с главното меню
 NewMenu=Ново меню
-Menu=Избор на меню
 MenuHandler=Манипулатор на меню
 MenuModule=Модул източник
 HideUnauthorizedMenu= Скриване на неоторизирани (сиви) менюта
@@ -1794,7 +1835,6 @@ TypePaymentDesc=0: Начин на плащане за клиент, 1: Начи
 IncludePath=Включва път (дефиниран в променлива %s)
 ExpenseReportsSetup=Настройка на модула за разходни отчети
 TemplatePDFExpenseReports=Шаблони на документи за разходни отчети
-ExpenseReportsIkSetup=Настройка на модул Разходни отчети - Показания на километража
 ExpenseReportsRulesSetup=Настройка на модул Разходни отчети - Правила
 ExpenseReportNumberingModules=Модул за номериране на разходни отчети
 NoModueToManageStockIncrease=Не е активиран модул, способен да управлява автоматичното увеличаване на наличности. Увеличаването на наличности ще се извършва само при ръчно въвеждане.
@@ -1864,7 +1904,7 @@ MailToSendReception=Стокови разписки
 MailToThirdparty=Контрагенти
 MailToMember=Членове
 MailToUser=Потребители
-MailToProject=Страница "Проекти"
+MailToProject=Проекти
 MailToTicket=Тикети
 ByDefaultInList=Показване по подразбиране в списъчен изглед
 YouUseLastStableVersion=Използвате последната стабилна версия
@@ -1960,6 +2000,8 @@ LoadThirdPartyFromName=Зареждане на името на контраге
 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
 FormatZip=Zip
 MainMenuCode=Код на меню (главно меню)
@@ -1974,7 +2016,7 @@ DisabledResourceLinkContact=Деактивиране на функция за с
 EnableResourceUsedInEventCheck=Активиране на функция за проверка дали даден ресурс се използва в събитие
 ConfirmUnactivation=Потвърдете задаването на първоначални настройки на модула
 OnMobileOnly=Само при малък екран (смартфон)
-DisableProspectCustomerType=Деактивиране на типа контрагент "Перспектива + Клиент" (контрагента трябва да бъде Перспектива или Клиент, но не може да бъде и двете)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Опростяване на интерфейса за незрящ човек
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Активирайте тази опция за незрящ човек или ако използвате приложението от текстов браузър като Lynx или Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Промяна на цвета на интерфейса за човек с нарушено цветоусещане
@@ -1996,13 +2038,15 @@ UseDebugBar=Използване на инструменти за отстран
 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
 EXPORTS_SHARE_MODELS=Моделите за експортиране се споделят с всички
 ExportSetup=Настройка на модула за експортиране на данни
 ImportSetup=Настройка на модула за импортиране на данни
 InstanceUniqueID=Уникален идентификатор на инстанцията
 SmallerThan=По-малък от
 LargerThan=По-голям от
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=С GMail акаунт, ако сте активирали валидирането в 2 стъпки е препоръчително да създадете специална втора парола за приложението, вместо да използвате своята парола за акаунта от https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
 EmailCollectorLoadThirdPartyHelp=Може да използвате това действие, за да намерите и заредите съществуващ контрагент във вашата база данни, чрез съдържанието на имейла. Намереният (или създаден) контрагент ще бъде използван при следващи действия, които се нуждаят от това. В полето на параметъра може да използвате, например 'EXTRACT:BODY:Name:\\s([^\\s]*)', ако искате да извлечете името на контрагента от низ 'Name: name to find', който е открит в съдържанието на имейла.
@@ -2029,4 +2073,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+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.

htdocs/langs/bg_BG/ecm.lang

@@ -23,19 +23,7 @@ ECMSearchByKeywords=Търсене по ключови думи
 ECMSearchByEntity=Търсене по обект
 ECMSectionOfDocuments=Директории с документи
 ECMTypeAuto=Автоматично
-ECMDocsBySocialContributions=Документи свързани със социални или фискални такси
+ECMDocsBy=Documents linked to %s
-ECMDocsByThirdParties=Документи свързани с контрагенти
-ECMDocsByProposals=Документи свързани с предложения
-ECMDocsByOrders=Документи свързани с поръчки за продажба
-ECMDocsByContracts=Документи свързани с договори
-ECMDocsByInvoices=Документи свързани с фактури за продажба
-ECMDocsByProducts=Документи свързани с продукти
-ECMDocsByProjects=Документи свързани с проекти
-ECMDocsByUsers=Документи свързани с потребители
-ECMDocsByInterventions=Документи свързани с интервенции
-ECMDocsByExpenseReports=Документи свързани с разходни отчети
-ECMDocsByHolidays=Документи свързани с отпуски
-ECMDocsBySupplierProposals=Документи свързани със запитвания към доставчици
 ECMNoDirectoryYet=Няма създадена директория
 ShowECMSection=Показване на директория
 DeleteSection=Изтриване на директория
@@ -50,3 +38,6 @@ ReSyncListOfDir=Синхронизиране на списъка с директ
 HashOfFileContent=Хеш код на файла
 NoDirectoriesFound=Няма намерени директории
 FileNotYetIndexedInDatabase=Файлът все още не е индексиран в базата данни (опитайте да го качите отново)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup

htdocs/langs/bg_BG/install.lang

@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Конфигурационният файл <b> %s </b> н
 ConfFileIsWritable=Конфигурационният файл <b>%s</b> е презаписваем.
 ConfFileMustBeAFileNotADir=Конфигурационният файл <b>%s</b> трябва да е файл, а не директория.
 ConfFileReload=Презареждане на параметри от конфигурационен файл.
-PHPSupportSessions=PHP поддържа сесии.
 PHPSupportPOSTGETOk=PHP поддържа променливи POST и GET.
 PHPSupportPOSTGETKo=Възможно е вашата настройка на PHP да не поддържа променливи POST и/или GET. Проверете параметъра <b> variables_order </b> в php.ini.
-PHPSupportGD=PHP поддържа GD графични функции.
+PHPSupportSessions=PHP поддържа сесии.
-PHPSupportCurl=PHP поддържа Curl.
-PHPSupportCalendar=PHP поддържа разширения на календари.
-PHPSupportUTF8=PHP поддържа UTF8 функции.
-PHPSupportIntl=PHP поддържа Intl функции.
-PHPSupportxDebug=PHP поддържа разширени функции за отстраняване на грешки.
 PHPSupport=PHP поддържа %s функции.
 PHPMemoryOK=Максималният размер на паметта за PHP сесия е настроен на <b>%s</b>. Това трябва да е достатъчно.
 PHPMemoryTooLow=Вашият максимален размер на паметта за PHP сесия е настроен на <b> %s </b> байта. Това е твърде ниско. Променете <b> php.ini </b> като зададете стойност на параметър <b> memory_limit </b> поне <b> %s </b> байта.

htdocs/langs/bg_BG/intracommreport.lang

@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Списък
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode

htdocs/langs/bg_BG/members.lang

@@ -19,14 +19,12 @@ MembersCards=Визитни картички на членове
 MembersList=Списък на членове
 MembersListToValid=Списък на чернови членове (за валидиране)
 MembersListValid=Списък на валидирани членове
-MembersListUpToDate=Списък на членове с платен абонамент
+MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=Списък на членове с неплатен абонамент
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=Списък на деактивирани членове
 MembersListQualified=Списък на квалифицирани членове
 MenuMembersToValidate=Чернови членове
 MenuMembersValidated=Валидирани членове
-MenuMembersUpToDate=С платен абонамент
-MenuMembersNotUpToDate=С неплатен абонамент
 MenuMembersResiliated=Деактивирани членове
 MembersWithSubscriptionToReceive=Членове с абонамент за получаване
 MembersWithSubscriptionToReceiveShort=Абонамент за получаване
@@ -34,6 +32,7 @@ DateSubscription=Дата на абонамент
 DateEndSubscription=Крайна дата на абонамент
 EndSubscription=Край на абонамент
 SubscriptionId=Идентификатор на абонамент
+WithoutSubscription=Without subscription
 MemberId=Идентификатор на член
 NewMember=Нов член
 MemberType=Тип член
@@ -81,7 +80,7 @@ DeleteType=Изтриване
 VoteAllowed=Може да гласува
 Physical=Реален
 Moral=Морален
-MorPhy=Същност
+MorAndPhy=Moral and Physical
 Reenable=Повторно активиране
 ResiliateMember=Деактивиране на член
 ConfirmResiliateMember=Сигурни ли сте, че искате да деактивирате този член?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Изпращане на имейл при вал
 SendingEmailOnNewSubscription=Изпращане на имейл при нов абонамент
 SendingReminderForExpiredSubscription=Изпращане на напомняне за изтекли абонаменти
 SendingEmailOnCancelation=Изпращане на имейл при анулиране
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Вашата молба за членство е получена
 YourMembershipWasValidated=Вашата молба за членство е валидирана
@@ -167,6 +167,7 @@ MembersStatisticsByState=Статистика за членове по обла
 MembersStatisticsByTown=Статистика за членове по град
 MembersStatisticsByRegion=Статистика за членове по регион
 NbOfMembers=Брой членове
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=Не са намерени валидирани членове
 MembersByCountryDesc=Този екран показва статистически данни за членове по държави. Графиката зависи от онлайн услугата за графики на Google и е достъпна само, ако е налична интернет връзка.
 MembersByStateDesc=Този екран показва статистически данни за членове по области.
@@ -176,6 +177,7 @@ MenuMembersStats=Статистика
 LastMemberDate=Дата на последен член
 LatestSubscriptionDate=Последна дата на абонамент
 MemberNature=Произход на член
+MembersNature=Nature of members
 Public=Информацията е публична
 NewMemberbyWeb=Добавен е нов член. Очаква одобрение.
 NewMemberForm=Формуляр за нов член

htdocs/langs/bg_BG/products.lang

@@ -108,20 +108,20 @@ 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=Активиране на виртуални продукти (комплекти)
+AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Виртуални продукти
+AssociatedProducts=Kits
-AssociatedProductsNumber=Брой продукти, съставящи този виртуален продукт
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Брой основни опаковащи продукти
 ParentProducts=Основни продукти
-IfZeroItIsNotAVirtualProduct=Ако е 0, този продукт не е виртуален продукт
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=Ако е 0, този продукт не се използва от никой виртуален продукт
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Филтър по ключова дума
 CategoryFilter=Филтър по категория
 ProductToAddSearch=Търсене на продукт за добавяне
 NoMatchFound=Не са намерени съвпадения
 ListOfProductsServices=Списък на продукти / услуги
-ProductAssociationList=Списък на продукти / услуги, които са компонент(и) на този виртуален продукт (комплект)
+ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=Списък на продукти / услуги с този продукт като компонент
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Един от избраните продукти е основен за текущия продукт
 DeleteProduct=Изтриване на продукт / услуга
 ConfirmDeleteProduct=Сигурни ли сте, че желаете да изтриете този продукт / услуга?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Налични глобални стойности:
 PriceMode=Ценови режим
 PriceNumeric=Номер
 DefaultPrice=Цена по подразбиране
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Увеличаване / намаляване на наличност при промяна на основен продукт
 ComposedProduct=Съставни продукти
 MinSupplierPrice=Минимална покупната цена
@@ -339,6 +340,7 @@ UseProductFournDesc=Добавяне на функция за дефиниран
 ProductSupplierDescription=Описание на продукта от доставчик
 UseProductSupplierPackaging=Използване на пакетиране по цени на доставчик (преизчислява количествата според пакетирането, определено чрез доставната цена, когато добавяте / актуализирате ред в документите на доставчика)
 PackagingForThisProduct=Пакетиране
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=Количеството за реда е преизчислено според пакетирането на доставчика
 
 #Attributes

htdocs/langs/bg_BG/recruitment.lang

@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
+PositionToBeFilled=Длъжност
-PositionsToBeFilled=Job offers to be filled
+PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job offers to be filled
+ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job offers to be filled
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+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 candidature
+NewCandidature=New application
-ListOfCandidatures=List of candidatures
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
+AnswerCandidature=Application answer
-YourCandidature=Your candidature
+YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+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)

htdocs/langs/bg_BG/stocks.lang

@@ -34,7 +34,7 @@ StockMovementForId=Идентификатор на движение %d
 ListMouvementStockProject=Списък на движения на стокови наличности, свързани с проекта
 StocksArea=Секция със складове
 AllWarehouses=Всички складове
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Включва чернови поръчки
 Location=Местоположение
 LocationSummary=Кратко име на местоположение
@@ -122,8 +122,9 @@ DesiredStockDesc=Тази стойност ще бъде използвана з
 StockToBuy=За поръчка
 Replenishment=Попълване на наличности
 ReplenishmentOrders=Поръчки за попълване
-VirtualDiffersFromPhysical=Според опциите за увеличаване / намаляване на наличности, физическите и виртуални наличности (физически + текущи поръчки) могат да се различават
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseVirtualStockByDefault=Използване на виртуални наличности по подразбиране (вместо физически наличности) при използване на функцията за попълване на наличности
+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=Използване на виртуални наличности
 UsePhysicalStock=Използване на физически наличности
 CurentSelectionMode=Текущ режим на избор
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=Този продукт е вече в сп
 SelectCategory=Филтър по категория
 SelectFournisseur=Филтър по доставчик
 inventoryOnDate=Инвентаризация
-INVENTORY_DISABLE_VIRTUAL=Виртуален продукт (комплект): не намалявайте наличността на съставен продукт
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Използване на покупната цена, ако не може да бъде намерена последна цена за покупка
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Движенията на наличности ще имат датата на инвентаризация (вместо датата на валидиране на инвентаризация)
 inventoryChangePMPPermission=Променяне на стойността на СИЦ (средно изчислена цена) за даден продукт
 ColumnNewPMP=Нова СИЦ
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in 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)
+UpdateByScaningLot=Update by scan (lot|serial barcode)

htdocs/langs/bg_BG/suppliers.lang

@@ -38,6 +38,7 @@ MenuOrdersSupplierToBill=Поръчки за покупка за фактури
 NbDaysToDelivery=Забавяне на доставка (дни)
 DescNbDaysToDelivery=Най-дълго забавяне на доставка за продукти от тази поръчка
 SupplierReputation=Репутация на доставчика
+ReferenceReputation=Reference reputation
 DoNotOrderThisProductToThisSupplier=Не поръчвайте
 NotTheGoodQualitySupplier=Ниско качество
 ReputationForThisProduct=Репутация

htdocs/langs/bn_BD/admin.lang

@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+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>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+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=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1282,7 +1321,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1523,7 +1562,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1612,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1639,11 +1680,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1794,7 +1835,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1904,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2000,8 @@ 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
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2016,7 @@ 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)
+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
@@ -1996,13 +2038,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+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
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+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.
@@ -2029,4 +2073,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+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.

htdocs/langs/bn_BD/ecm.lang

@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsBy=Documents linked to %s
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup

htdocs/langs/bn_BD/install.lang

@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 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.
-PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportSessions=This PHP supports sessions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
 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.

htdocs/langs/bn_BD/intracommreport.lang

@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode

htdocs/langs/bn_BD/members.lang

@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
+MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form

htdocs/langs/bn_BD/products.lang

@@ -108,20 +108,20 @@ 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 virtual products (kits)
+AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Virtual products
+AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes

htdocs/langs/bn_BD/recruitment.lang

@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
+PositionToBeFilled=Job position
-PositionsToBeFilled=Job offers to be filled
+PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job offers to be filled
+ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job offers to be filled
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+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 candidature
+NewCandidature=New application
-ListOfCandidatures=List of candidatures
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
+AnswerCandidature=Application answer
-YourCandidature=Your candidature
+YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+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)

htdocs/langs/bn_BD/stocks.lang

@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+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
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in 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)
+UpdateByScaningLot=Update by scan (lot|serial barcode)

htdocs/langs/bn_BD/suppliers.lang

@@ -38,6 +38,7 @@ 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

htdocs/langs/bn_IN/admin.lang

@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+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>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+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=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1282,7 +1321,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1523,7 +1562,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1612,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1639,11 +1680,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1794,7 +1835,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1904,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2000,8 @@ 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
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2016,7 @@ 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)
+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
@@ -1996,13 +2038,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+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
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+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.
@@ -2029,4 +2073,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+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.

htdocs/langs/bn_IN/ecm.lang

@@ -23,19 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsBy=Documents linked to %s
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
 ECMNoDirectoryYet=No directory created
 ShowECMSection=Show directory
 DeleteSection=Remove directory
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup

htdocs/langs/bn_IN/install.lang

@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=This PHP supports sessions.
 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.
-PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportSessions=This PHP supports sessions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
 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.

htdocs/langs/bn_IN/intracommreport.lang

@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode

htdocs/langs/bn_IN/members.lang

@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
+MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form

htdocs/langs/bn_IN/products.lang

@@ -108,20 +108,20 @@ 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 virtual products (kits)
+AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Virtual products
+AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes

htdocs/langs/bn_IN/recruitment.lang

@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
+PositionToBeFilled=Job position
-PositionsToBeFilled=Job offers to be filled
+PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job offers to be filled
+ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job offers to be filled
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+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 candidature
+NewCandidature=New application
-ListOfCandidatures=List of candidatures
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
+AnswerCandidature=Application answer
-YourCandidature=Your candidature
+YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+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)

htdocs/langs/bn_IN/stocks.lang

@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+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
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in 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)
+UpdateByScaningLot=Update by scan (lot|serial barcode)

htdocs/langs/bn_IN/suppliers.lang

@@ -38,6 +38,7 @@ 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

htdocs/langs/bs_BA/admin.lang

@@ -37,6 +37,8 @@ UnlockNewSessions=Ukloni zaključavanje veze
 YourSession=Vaša sesija
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -71,7 +73,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=Onemogućena JavaScript
 UsePreviewTabs=Koristi kartice pretpregleda
 ShowPreview=Prikaži pretpregled
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Pretpregled nije moguć
 ThemeCurrentlyActive=Trenutno aktivna tema
 CurrentTimeZone=Vremenska zona PHP (servera)
@@ -271,7 +274,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+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>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
+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=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -551,8 +559,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Intervencije
@@ -656,7 +662,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +677,7 @@ Module63000Name=Resursi
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +694,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +703,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +728,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -825,10 +836,11 @@ Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
 Permission430=Use Debug Bar
-Permission511=Read payments of salaries
+Permission511=Read payments of salaries (yours and subordinates)
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
-Permission517=Export salaries
+Permission517=Read payments of salaries of everybody
+Permission519=Export salaries
 Permission520=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
@@ -843,6 +855,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +899,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +915,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +951,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,6 +981,17 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Postavke snimljene
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1145,6 +1182,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1194,7 +1232,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
+ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1282,7 +1321,7 @@ GetBarCode=Preuzeti barkod
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1523,7 +1562,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Izvještaj o perfomansama postavki/optimizacije
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Aplikativni cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1571,9 +1612,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1639,11 +1680,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -1794,7 +1835,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1864,7 +1904,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Subjekti
 MailToMember=Članovi
 MailToUser=Korisnici
-MailToProject=Projects page
+MailToProject=Projekti
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -1960,6 +2000,8 @@ 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
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
@@ -1974,7 +2016,7 @@ 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)
+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
@@ -1996,13 +2038,15 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+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
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+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.
@@ -2029,4 +2073,10 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+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.

htdocs/langs/bs_BA/ecm.lang

@@ -23,19 +23,7 @@ ECMSearchByKeywords=Traži po ključnim riječima
 ECMSearchByEntity=Traži po objektu
 ECMSectionOfDocuments=Direktoriji dokumenata
 ECMTypeAuto=Automatski
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsBy=Documents linked to %s
-ECMDocsByThirdParties=Dokumenti vezani sza subjekte
-ECMDocsByProposals=Dokumenti vezani za prijedloge
-ECMDocsByOrders=Dokumenti vezani za narudžbe kupaca
-ECMDocsByContracts=Dokumenti vezani za ugovore
-ECMDocsByInvoices=Dokumenti vezani za fakture klijenata
-ECMDocsByProducts=Dokumenti vezani za proizvode
-ECMDocsByProjects=Dokumenti vezani za projekte
-ECMDocsByUsers=Dokumenti povezani s korisnicima
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
 ECMNoDirectoryYet=Nema kreiranih direktorija
 ShowECMSection=Prikaži direktorij
 DeleteSection=Ukloni direktorij
@@ -50,3 +38,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup

htdocs/langs/bs_BA/install.lang

@@ -8,15 +8,9 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Konfiguracijska datoteka <b>%s</b> je slobodna za pisanje.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
-PHPSupportSessions=Ovaj PHP podržava sesije.
 PHPSupportPOSTGETOk=Ovaj PHP podržava varijable POST i GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
+PHPSupportSessions=Ovaj PHP podržava sesije.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Vaša maksimalna memorija za PHP  sesiju je postavljena na <b>%s</b>. To bi trebalo biti dovoljno.
 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.

htdocs/langs/bs_BA/intracommreport.lang

@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=Spisak
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of nalysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode

htdocs/langs/bs_BA/members.lang

@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
+MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Obriši
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
@@ -176,6 +177,7 @@ MenuMembersStats=Statistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form

htdocs/langs/bs_BA/products.lang

@@ -108,20 +108,20 @@ 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 virtual products (kits)
+AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Virtual products
+AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this virtual product
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Broj
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimalna kupovna cijena
@@ -339,6 +340,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes

htdocs/langs/bs_BA/recruitment.lang

@@ -45,26 +45,31 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
+PositionToBeFilled=Pozicija
-PositionsToBeFilled=Job offers to be filled
+PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job offers to be filled
+ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job offers to be filled
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+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 candidature
+NewCandidature=New application
-ListOfCandidatures=List of candidatures
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
+AnswerCandidature=Application answer
-YourCandidature=Your candidature
+YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
+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)

htdocs/langs/bs_BA/stocks.lang

@@ -34,7 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
 LocationSummary=Skraćeni naziv lokacije
@@ -122,8 +122,9 @@ DesiredStockDesc=This stock amount will be the value used to fill the stock by r
 StockToBuy=Za narudžbu
 Replenishment=Nadopuna
 ReplenishmentOrders=Narudžne za nadopunu
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+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
@@ -198,8 +199,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventar
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -238,5 +237,6 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in 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)
+UpdateByScaningLot=Update by scan (lot|serial barcode)

htdocs/langs/bs_BA/suppliers.lang

@@ -38,6 +38,7 @@ 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

htdocs/langs/ca_ES/accountancy.lang

@@ -18,14 +18,16 @@ DefaultForService=Defecte per al servei
 DefaultForProduct=Defecte per al producte
 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 Compatibilitat avançada
+ConfigAccountingExpert=Configuració del mòdul de comptabilitat (doble entrada)
 Journalization=Registrament al diari
-Journaux=Diaris
+Journals=Diaris
 JournalFinancial=Diaris financers
 BackToChartofaccounts=Tornar al Pla comptable
 Chartofaccounts=Pla comptable
+ChartOfSubaccounts=Pla de comptes individuals
+ChartOfIndividualAccountsOfSubsidiaryLedger=Pla de comptes individuals del llibre major
 CurrentDedicatedAccountingAccount=Compte dedicat actual
-AssignDedicatedAccountingAccount=Nou compte per assignar
+AssignDedicatedAccountingAccount=Nou compte 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
@@ -33,8 +35,8 @@ OtherInfo=Altra informació
 DeleteCptCategory=Eliminar el compte comptable del grup
 ConfirmDeleteCptCategory=Estàs segur que vols eliminar aquest compte comptable del grup de comptabilitat?
 JournalizationInLedgerStatus=Estat del diari
-AlreadyInGeneralLedger=Registrat en el Llibre Major
+AlreadyInGeneralLedger=Ja transferit als diaris comptables i llibres majors
-NotYetInGeneralLedger=No s'ha registrat en el Llibre Major
+NotYetInGeneralLedger=Encara no s'ha transferit als diaris ni llibres comptables
 GroupIsEmptyCheckSetup=El grup està buit, comproveu la configuració del grup de comptabilitat personalitzat
 DetailByAccount=Mostra detalls per compte
 AccountWithNonZeroValues=Compte amb valors no nuls
@@ -43,7 +45,9 @@ CountriesInEEC=Països a la CEE
 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 transaccions i extractes
+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.
+VueByAccountAccounting=Veure per compte comptable
 
 MainAccountForCustomersNotDefined=Compte comptable per a clients no definida en la configuració
 MainAccountForSuppliersNotDefined=Compte comptable principal per a proveïdors no definit a la configuració
@@ -54,15 +58,15 @@ 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 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 el Llibre Major)
+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)
 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: Comprovar que existeix un model de pla de compte o crear-ne un des del menu %s
+AccountancyAreaDescChartModel=PAS %s: Comproveu que existeix un model de pla comptable o creeu-ne un des del menú %s
-AccountancyAreaDescChart=PAS %s: Seleccionar i/o completar el vostre pla de compte des del menu %s
+AccountancyAreaDescChart=PAS %s: Seleccioneu i/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=STEP %s: Definir comptes comptables predeterminats. Per això, utilitzeu l'entrada del menú %s.
+AccountancyAreaDescDefault=PAS %s: Definiu comptes comptables per defecte. Per a això, utilitzeu l'entrada de menú %s.
 AccountancyAreaDescExpenseReport=PAS %s: Defineix els comptes comptables per defecte per a cada tipus d'informe de despeses. Per això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescSal=PAS %s: Defineix comptes comptables per defecte per al pagament de salaris. Per això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescContrib=PAS %s: defineix comptes de comptabilitat per defecte per a despeses especials (impostos diversos). Per això, utilitzeu l'entrada del menú %s.
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=PAS %s: Afegir o editar transaccions existents i gene
 
 AccountancyAreaDescClosePeriod=PAS %s: Tancar el període de forma que no pot fer modificacions en un futur.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=No s'ha completat un pas obligatori en la configuració (el codi comptable diari no està definit per a tots els comptes bancaris)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=No s'ha completat un pas obligatori en la configuració (no s'ha definit el codi comptable diari per a tots els comptes bancaris)
 Selectchartofaccounts=Seleccionar el pla de comptes actiu
 ChangeAndLoad=Canviar i carregar
 Addanaccount=Afegir un compte comptable
@@ -89,13 +93,15 @@ SubledgerAccount=Subcompte comptable
 SubledgerAccountLabel=Títol del subcompte comptable
 ShowAccountingAccount=Mostrar diari de comptes
 ShowAccountingJournal=Mostrar diari comptable
+ShowAccountingAccountInLedger=Mostra el compte comptable al Llibre major
+ShowAccountingAccountInJournals=Mostra el compte comptable als diaris
 AccountAccountingSuggest=Compte comptable suggerit
 MenuDefaultAccounts=Comptes per defecte
 MenuBankAccounts=Comptes bancaris
 MenuVatAccounts=Comptes d'IVA
 MenuTaxAccounts=Comptes relacionats amb impostos
 MenuExpenseReportAccounts=Comptes d'informes de despeses
-MenuLoanAccounts=Comptes de prèstecs
+MenuLoanAccounts=Comptes de préstecs
 MenuProductsAccounts=Comptes comptables de producte
 MenuClosureAccounts=Comptes de tancament
 MenuAccountancyClosure=Tancament
@@ -110,8 +116,9 @@ ExpenseReportsVentilation=Comptabilització d'informes de despeses
 CreateMvts=Crea una nova transacció
 UpdateMvts=Modificació d'una transacció
 ValidTransaction=Valida l'assentament
-WriteBookKeeping=Registreu les transaccions a Ledger
+WriteBookKeeping=Registra transaccions en comptabilitat
 Bookkeeping=Llibre major
+BookkeepingSubAccount=Subcompte
 AccountBalance=Compte saldo
 ObjectsRef=Referència de l'objecte origen
 CAHTF=Total de compra a Proveïdor abans d'impostos
@@ -149,7 +156,8 @@ ACCOUNTING_MANAGE_ZERO=Gestiona un nombre diferent de zero al final d'un compte
 BANK_DISABLE_DIRECT_INPUT=Des-habilitar l'enregistrament directe de transaccions al compte bancari 
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilita l'exportació d'esborrany en el diari
 ACCOUNTANCY_COMBO_FOR_AUX=Activa la llista de combo per al compte subsidiari (pot ser lent si tens molts tercers)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_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_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
@@ -166,9 +174,11 @@ ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte de comptabilitat de la transferència ba
 TransitionalAccount=Compte de transferència bancària transitòria
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'espera
-DONATION_ACCOUNTINGACCOUNT=Compte comptable per registrar les donacions
+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_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)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Compte de comptabilitat per defecte dels productes comprats i importats fora de la CEE (utilitzat si no està definit a la taula de productes)
@@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Per grups predefinits
 ByPersonalizedAccountGroups=Per grups personalitzats
 ByYear=Per any
 NotMatch=No definit
-DeleteMvt=Elimina línies del Llibre Major
+DeleteMvt=Elimina algunes línies d'operació de la comptabilitat
 DelMonth=Mes a eliminar
 DelYear=Any a eliminar
 DelJournal=Diari per esborrar
-ConfirmDeleteMvt=Això eliminarà totes les línies del Llibre Major de l'any/mes i/o d'un diari específic (requerit almenys un criteri). S'haurà de d'utilitzar la funció 'Registre en comptabilitat' per a que el registre eliminat torni al llibre major.
+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.
-ConfirmDeleteMvtPartial=Això eliminarà l'assentament del Llibre Major (se suprimiran totes les línies relacionades amb el mateix assentament)
+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
-DescJournalOnlyBindedVisible=Aquesta és una vista de registres que estan comptabilitzats a un compte comptable i que poden registrar-se al Llibre major.
+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
 ThirdpartyAccountNotDefined=Comptes comptables de tercers (clients o proveïdors) sense definir
 ProductAccountNotDefined=Comptes comptables per al producte sense definir
@@ -254,12 +264,12 @@ DescVentilDoneCustomer=Consulta aquí la llista de línies de factures a clients
 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:
 Vide=-
-DescVentilSupplier=Consulteu aquí la llista de les línies de facturació dels proveïdor vinculades o encara no lligades a un compte de comptable de producte (només es poden veure els registres no transferits a comptabilitat)
+DescVentilSupplier=Consulteu aquí la llista de les línies de facturació dels proveïdors vinculades o encara no lligades a un compte comptable de producte (només es poden veure els registres no transferits a comptabilitat)
 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 del informe per tipus de despesa, l'aplicació serà capaç de fer tots els vincles entre les línies del 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 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>".
-DescVentilDoneExpenseReport=Consulteu aquí la llista de les línies dels informes de despeses i les seves comptes comptables corresponent a les tarifes
+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
 OverviewOfMovementsNotValidated=Pas 1 / Visió general dels moviments no validats. (Cal tancar un exercici)
@@ -285,10 +295,10 @@ ShowTutorial=Mostrar Tutorial
 NotReconciled=No conciliat
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Opcions d'enquadernació
 ApplyMassCategories=Aplica categories massives
 AddAccountFromBookKeepingWithNoCategories=Compte disponible encara no al grup personalitzat
-CategoryDeleted=La categoria per al compte contable ha sigut eliminada
+CategoryDeleted=S'ha eliminat la categoria per al compte comptable
 AccountingJournals=Diari de comptabilitat
 AccountingJournal=Diari comptable
 NewAccountingJournal=Nou diari comptable
@@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Aquest diari ja està en ús
 AccountingAccountForSalesTaxAreDefinedInto=Nota: el compte de comptes de l'impost de vendes es defineix al menú <b> %s </b> - <b> %s </b>
 NumberOfAccountancyEntries=Número d'entrades
 NumberOfAccountancyMovements=Número de moviments
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Desactiva la vinculació i transferència de comptabilitat en vendes (les factures dels clients no es tindran en compte a la comptabilitat)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactiva la vinculació i transferència a la comptabilitat de les compres (les factures de proveïdors no es tindran en compte a la comptabilitat)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactiva la vinculació i transferència de comptes en els informes de despeses (els informes de despeses no es tindran en compte a la comptabilitat)
 
 ## Export
 ExportDraftJournal=Exportar esborranys del llibre 
@@ -331,7 +344,7 @@ 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 pot ser utilitzat per establir un compte per defecte que s'utilitzarà per enllaçar registre de transaccions sobre els pagament de salaris, donació, impostos i IVA quan no hi ha encara compte comptable específic definit.
+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.
 Options=Opcions
 OptionModeProductSell=En mode vendes
@@ -349,8 +362,8 @@ OptionModeProductBuyExportDesc=Mostra tots els productes amb compte comptable pe
 CleanFixHistory=Eliminar el codi comptable de les línies que no existeixen als gràfics de compte
 CleanHistory=Reinicia tota la comptabilització per l'any seleccionat
 PredefinedGroups=Grups predefinits
-WithoutValidAccount=Sense compte dedicada vàlida
+WithoutValidAccount=Sense compte dedicat vàlid
-WithValidAccount=Amb compte dedicada vàlida
+WithValidAccount=Amb un compte dedicat vàlid
 ValueNotIntoChartOfAccount=Aquest compte comptable no existeix al pla comptable
 AccountRemovedFromGroup=S'ha eliminat el compte del grup
 SaleLocal=Venda local
@@ -366,7 +379,7 @@ Formula=Fórmula
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=No s'han fet alguns passos obligatoris de configuració, si us plau, completeu-los
-ErrorNoAccountingCategoryForThisCountry=No hi ha cap grup comptable disponible per al país %s (Veure Inici - Configuració - Diccionaris)
+ErrorNoAccountingCategoryForThisCountry=No hi ha cap grup de comptes comptables disponible per al país %s (Vegeu Inici - Configuració - Diccionaris)
 ErrorInvoiceContainsLinesNotYetBounded=Intenta actualitzar algunes línies de la factura <strong> %s </strong>, però algunes altres encara no estan vinculades al compte de comptabilitat. Es rebutja el registre comptable de totes les línies d'aquesta factura.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algunes línies a la factura no estan vinculades al compte de comptabilitat.
 ExportNotSupported=El format d'exportació configurat no està suportat en aquesta pàgina

htdocs/langs/ca_ES/admin.lang

@@ -30,13 +30,15 @@ SessionSaveHandler=Modalitat de desar sessions
 SessionSavePath=Desa la ubicació de la sessió
 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 seu PHP no permiteix mostrar les sessions en curs
+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.
 UnlockNewSessions=Eliminar bloqueig de connexions
 YourSession=La seva sessió
 Sessions=Sessions d'usuaris
 WebUserGroup=Servidor web usuari/grup
+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
@@ -55,7 +57,7 @@ SetupArea=Configuració
 UploadNewTemplate=Carrega nova plantilla(s)
 FormToTestFileUploadForm=Formulari de prova de càrrega de fitxer (segons opcions escollides)
 IfModuleEnabled=Nota: sí només és eficaç si el mòdul <b>%s</b> està activat
-RemoveLock=Esborreu el fitxer <b>%s</b>, si existeix, per permetre la utilitat d'actualització.
+RemoveLock=Elimineu/renombreu 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.
@@ -71,7 +73,7 @@ DisableJavascriptNote=Nota: per a propòsits de prova o de depuració. Per a l
 UseSearchToSelectCompanyTooltip=També si tenen un gran número de tercers (> 100.000), pot augmentar la velocitat mitjançant l'estableciement COMPANY_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació de la cadena
 UseSearchToSelectContactTooltip=També si vostè té un gran número de tercers (> 100.000), pot augmentar la velocitat mitjançant l'estableciment. CONTACT_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació 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=Esperar 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 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
 NumberOfBytes=Nombre de bytes
 SearchString=Cerca cadena
@@ -80,11 +82,12 @@ AllowToSelectProjectFromOtherCompany=En un document d'un tercer, pots triar un p
 JavascriptDisabled=Javascript desactivat
 UsePreviewTabs=Veure fitxes "vista prèvia"
 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=Les dates es guarden i tornen pel servidor de la base de dedes tal com si les haguessin enviat com una cadena. La zona horària només te efecte si s'utilitza la funció UNIX_TIMESTAMP (que no deuria ser utilitzada per dolibarr, per el que la zona horària de la base de dades no hauria de tenir efecte, encara que s'hagi canviat després d'introduir les 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
 Table=Taula
 Fields=Camps
@@ -100,9 +103,9 @@ 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
 AntiVirusCommand=Ruta completa cap al comandament antivirus
-AntiVirusCommandExample=Exemple per al dimoni ClamAv (requerix clamav-daemon): /usr/bin/clamdscan<br>Exemple per a ClamWin (molt molt lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+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"
+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
@@ -200,7 +203,7 @@ 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.
 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 concedir permisos als usuaris després d'activar el mòdul. Feu clic al botó on / off <span class="small valignmiddle"> %s </span> de cada mòdul per habilitar o desactivar un mòdul / aplicació.
+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 en el seu sistema d'arxius ho permiteixen, pot utilitzar aquesta ferramente per instal·lar un mòdul extern. El mòdul estarà aleshores visible en la pestanya <strong>%s</strong>
 ModulesMarketPlaces=Trobar mòduls/complements externs
@@ -220,7 +223,7 @@ AchatTelechargement=Comprar / Descarregar
 GoModuleSetupArea=Per desplegar / instal·lar un nou mòdul, aneu a l'àrea de configuració del mòdul: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
 DoliPartnersDesc=Llista d’empreses que ofereixen mòduls o funcions desenvolupades a mida. <br> Nota: ja que Dolibarr és una aplicació de codi obert, <i> qualsevol usuari </i> experimentat en la programació PHP hauria de poder desenvolupar un mòdul.
-WebSiteDesc=Llocs web de referència per trobar més mòduls (no core)...
+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...
 URL=URL
 RelativeURL=URL relativa
@@ -271,7 +274,7 @@ NoticePeriod=Preavís
 NewByMonth=Nou per mes
 Emails=Correus electrònics
 EMailsSetup=Configuració de correu electrònic
-EMailsDesc=Aquesta pàgina permet reescriure els paràmetres del PHP en quan a l'enviament de correus. A la majoria dels casos, al sistema operatiu Unix/Linux, la configuració per defecte del PHP és correcta i no calen aquests paràmetres.
+EMailsDesc=Aquesta pàgina et permet establir paràmetres o opcions per a l'enviament de correu electrònic.
 EmailSenderProfiles=Perfils de remitents de correus electrònics
 EMailsSenderProfileDesc=Podeu mantenir aquesta secció buida. Si introduïu aquí alguns emails, aquests seran afegits a la llista de possibles remitents al desplegable quan escrigueu un correu electrònic nou.
 MAIN_MAIL_SMTP_PORT=Port del servidor SMTP (Per defecte a php.ini: <b>%s</b>)
@@ -289,6 +292,7 @@ MAIN_MAIL_SMTPS_ID=ID d'autenticació SMTP (si el servidor requereix autenticaci
 MAIN_MAIL_SMTPS_PW=Contrasenya SMTP (si el servidor requereix autenticació)
 MAIN_MAIL_EMAIL_TLS=Utilitza el xifratge TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Ús d'encriptació TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoritza els certificats autosignats
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Utilitzar DKIM per a generar firma d'email
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domini d'email per a utilitzar amb dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nom del selector dkim
@@ -332,7 +336,7 @@ SetupIsReadyForUse=La instal·lació del mòdul ha finalitzat. No obstant, ha d'
 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=<br>Declareu-lo al fitxer <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Si aquestes línies ja hi són però comentades amb un "#",  llavors simplement descomenteu-les treient aquest caràcter.
-YouCanSubmitFile=Podeu pujar el fitxer .zip del paquet de mòdul des d’aquí:
+YouCanSubmitFile=Podeu pujar el fitxer .zip del paquet del mòdul des d’aquí:
 CurrentVersion=Versió actual de Dolibarr
 CallUpdatePage=Ves a la pàgina que actualitza l'estructura de base de dades i les dades: %s
 LastStableVersion=Última versió estable
@@ -362,7 +366,7 @@ SeeWikiForAllTeam=Mira a la pàgina Wiki per veure una llista de contribuents i
 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
 DisableLinkToHelp=Amaga l'enllaç a l'ajuda en línia "<b>%s</b>"
-AddCRIfTooLong=No hi ha línies de tall automátic, així que si el text es massa llarg no es mostrarà en els documents. Per favor afegeix un salt de línia a l'àrea de text si fos necessari.
+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.).
 MinLength=Longuitud mínima
 LanguageFilesCachedIntoShmopSharedMemory=arxius .lang en memòria compartida
@@ -417,7 +421,7 @@ Int=Enter
 Float=Decimal
 DateAndTime=Data i hora
 Unique=Unic
-Boolean=Boleà (una casella de verificació)
+Boolean=Boleà (una casella de selecció)
 ExtrafieldPhone = Telèfon
 ExtrafieldPrice = Preu
 ExtrafieldMail = Correu electrònic
@@ -427,8 +431,8 @@ ExtrafieldSelectList = Llista de selecció de table
 ExtrafieldSeparator=Separador (no és un camp)
 ExtrafieldPassword=Contrasenya
 ExtrafieldRadio=Botons tipus radio (només una opció)
-ExtrafieldCheckBox=Caselles de verificació
+ExtrafieldCheckBox=Caselles de selecció
-ExtrafieldCheckBoxFromList=Caselles de verificació des de taula
+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'
@@ -438,9 +442,9 @@ ExtrafieldParamHelpPassword=Mantenir aquest camp buit significa que el valor s'e
 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::filter<br><br>- idfilter ha de ser necessàriament una "primary int key" <br>- el filtre pot ser una comprovació senzilla (eg active=1) per mostrar només valors actius<br>També es pot emprar $ID$ al filtre per representar el ID de l'actual objecte en curs<br>Per fer un SELECT al filtre empreu $SEL$<br>Si voleu filtrar per algun camp extra ("extrafields") empreu la sintaxi extra.codicamp=... (a on codicamp és el codi del camp extra)<br><br>Per tenir la llista depenent d'una altre 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:<br>c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
+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
-ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName: Classpath<br>Sintaxi: ObjectName:Classpath<br>Exemples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+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
 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)
@@ -469,7 +473,7 @@ 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 del gerència
-EnableAndSetupModuleCron=Si vols tenir aquesta factura recurrent generada automàticament, el mòdul *%s* s'ha d'habilitar i configurar correctament. D'altra banda, la generació de factures s'ha de fer manualment des d'aquesta plantilla amb el bóto "Crea". Tingues en compte que si actives la generació automàtica, pots continuar generant factures manuals. No és possible la generació de duplicitats pel mateix període. 
+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
 ModuleCompanyCodeSupplierAquarium=%s seguit del codi de proveïdor per a un codi de comptabilitat del proveïdor 
 ModuleCompanyCodePanicum=Retorna un codi comptable buit.
@@ -478,9 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s seguit pel nom abreujat del client pel nom
 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).
 UseDoubleApproval=Utilitza una aprovació en 3 passos quan l'import (sense impostos) sigui més gran que...
-WarningPHPMail=ADVERTIMENT: Sovint és millor configurar correus electrònics de sortida per utilitzar el servidor de correu electrònic del vostre proveïdor en comptes de la configuració predeterminada. Alguns proveïdors 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 proveïdor de correu electrònic, de manera que alguns destinataris (el que sigui compatible amb el protocol restrictiu de DMARC), us preguntaran 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) poden respondre "no" perquè el servidor no és del seu, així que pocs dels correus electrònics enviats no poden ser acceptats (vés amb compte també de la quota d'enviament del proveïdor de correu electrònic). <br> Si el vostre proveïdor de correu electrònic (com Yahoo) té aquesta restricció, heu de canviar la configuració de correu electrònic per triar l'altre mètode "servidor SMTP" i introduir el servidor SMTP i les credencials proporcionades pel vostre proveïdor de correu electrònic.
+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:
+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.
+WarningPHPMailD=Si el mètode "PHP Mail" és realment el mètode que voleu utilitzar, podeu eliminar aquest advertiment afegint la constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP a 1 a Inici - Configuració - Altres.
 WarningPHPMail2=Si el vostre proveïdor SMTP necessita restringir al client de correu a una adreça IP (és raro), aquesta és la IP de l'agent d'usuari de correu (MUA) per la vostra aplicació ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=Si el nom de domini de la vostra adreça de correu electrònic del remitent està protegit per SPF (demaneu-li al proveïdor de correu electrònic), heu d’incloure les següents IP al registre SPF del DNS del vostre domini: <strong> %s </strong>.
+WarningPHPMailSPF=Si el nom de domini de l’adreça de correu electrònic del remitent està protegit per un registre SPF (pregunteu-li al vostre registrador de noms de domini), heu d’afegir les següents IP al registre SPF del DNS del vostre domini: <strong> %s </strong>.
 ClickToShowDescription=Clica per mostrar la descripció
 DependsOn=Aquest mòdul necesita el mòdul(s)
 RequiredBy=Aquest mòdul és requerit pel/s mòdul/s
@@ -547,12 +555,10 @@ Module55Name=Codis de barra
 Module55Desc=Gestió dels codis de barra
 Module56Name=Pagament per transferència bancària
 Module56Desc=Gestió del pagament de proveïdors mitjançant comandes de transferència de crèdit. Inclou la generació de fitxers SEPA per a països europeus.
-Module57Name=Pagaments mitjançant dèbit directe
+Module57Name=Cobraments per domiciliació bancària
 Module57Desc=Gestió de comandes de dèbit directe. Inclou la generació de fitxers SEPA per a països europeus.
 Module58Name=ClickToDial
 Module58Desc=Integració amb ClickToDial
-Module59Name=Bookmark4u
-Module59Desc=Afegeix funció per generar un compte Bookmark4u des d'un compte Dolibarr
 Module60Name=Enganxines
 Module60Desc=Gestió d’enganxines
 Module70Name=Intervencions
@@ -615,7 +621,7 @@ Module2200Desc=Utilitza expressions matemàtiques per a la generació automàtic
 Module2300Name=Tasques programades
 Module2300Desc=Gestió de tasques programades (alias cron o taula chrono)
 Module2400Name=Esdeveniments/Agenda
-Module2400Desc=Seguiment d'esdeveniments. Registre d'esdeveniments automàtics per fer el seguiment o registrar esdeveniments manuals o reunions. Aquest és el mòdul principal per a una bona gestió del client o la relació de proveïdors.
+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
 Module2500Desc=Sistema de gestió de documents / Gestió de continguts electrònics. Organització automàtica dels vostres documents generats o emmagatzemats. Compartiu-los quan ho necessiteu.
 Module2600Name=Serveis API/WEB (servidor SOAP)
@@ -656,7 +662,7 @@ Module50200Desc=Ofereix als clients una pàgina de pagament en línia de PayPal
 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 ...)
 Module50400Name=Comptabilitat (doble entrada)
-Module50400Desc=Gestió comptable (entrades dobles, suport general i llibres majors auxiliars). Exporta el llibre major en diversos altres formats de programari de comptabilitat.
+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
 Module54000Desc=L'impressió directa (sense obrir els documents) utilitza l'interfície Cups IPP (L'impressora té que ser visible pel servidor i CUPS té que estar instal·lat en el servidor)
 Module55000Name=Enquesta o votació
@@ -671,7 +677,7 @@ Module63000Name=Recursos
 Module63000Desc=Gestiona els recursos (impressores, cotxes, habitacions...) que pots compartir en esdeveniments
 Permission11=Consulta factures de client
 Permission12=Crear/Modificar factures
-Permission13=Devalidar factures
+Permission13=Invalida les factures dels clients
 Permission14=Validar factures
 Permission15=Envia factures per e-mail
 Permission16=Crear cobraments per factures de client
@@ -688,6 +694,7 @@ Permission32=Crear/modificar productes
 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)
@@ -696,6 +703,9 @@ Permission61=Consulta intervencions
 Permission62=Crea/modifica intervencions
 Permission64=Elimina intervencions
 Permission67=Exporta intervencions
+Permission68=Envia intervencions per correu electrònic
+Permission69=Valida intervencions
+Permission70=Invalida les intervencions
 Permission71=Consulta socis
 Permission72=Crea/modifica socis
 Permission74=Elimina socis
@@ -718,6 +728,7 @@ Permission95=Consulta informes
 Permission101=Consulta expedicions
 Permission102=Crear/modificar expedicions
 Permission104=Validar expedicions
+Permission105=Envia enviaments per correu electrònic
 Permission106=Exportar expedicions
 Permission109=Eliminar expedicions
 Permission111=Consultar comptes financers (comptes bancaris, caixes)
@@ -825,10 +836,11 @@ Permission402=Crear/modificar havers
 Permission403=Validar havers
 Permission404=Eliminar havers
 Permission430=Utilitzeu la barra de depuració
-Permission511=Consulta el pagament dels salaris
+Permission511=Consulta els pagaments dels sous (vostres i subordinats)
 Permission512=Crea/modifica el pagament dels salaris
 Permission514=Elimina pagament de salaris
-Permission517=Exportació salaris
+Permission517=Consulta els pagaments dels sous de tothom
+Permission519=Exportació salaris
 Permission520=Consulta préstecs
 Permission522=Crear/modificar préstecs
 Permission524=Eliminar préstecs
@@ -839,16 +851,19 @@ Permission532=Crear/modificar serveis
 Permission534=Eliminar serveis
 Permission536=Veure / gestionar els serveis ocults
 Permission538=Exportar serveis
-Permission561=Read payment orders by credit transfer
+Permission561=Llegeix les ordres de pagament per transferència de crèdit
-Permission562=Create/modify payment order by credit transfer
+Permission562=Crea/modifica ordres de pagament per transferència de crèdit
-Permission563=Send/Transmit payment order by credit transfer
+Permission563=Envia/Transmet ordre de pagament mitjançant transferència de crèdit
-Permission564=Record Debits/Rejections of credit transfer
+Permission564=Registra dèbits/rebutjos de transferència de crèdit
+Permission601=Consulta adhesius
+Permission602=Crea/modifica adhesius
+Permission609=Elimina adhesius
 Permission650=Llegeix llistes de materials
 Permission651=Crea / actualitza llistes de materials
 Permission652=Elimina llistes de materials
-Permission660=Read Manufacturing Order (MO)
+Permission660=Consulta l'ordre de fabricació (OF)
-Permission661=Create/Update Manufacturing Order (MO)
+Permission661=Creació/actualització de l'ordre de fabricació (OF)
-Permission662=Delete Manufacturing Order (MO)
+Permission662=Suprimeix l'ordre de fabricació (OF)
 Permission701=Consultar donacions
 Permission702=Crear/modificar donacions
 Permission703=Eliminar donacions
@@ -858,8 +873,8 @@ Permission773=Eliminar els informes de despeses
 Permission774=Consulta tots els informes de despeses (inclòs els usuaris no subordinats)
 Permission775=Aprovar els informes de despeses
 Permission776=Pagar informes de despeses
-Permission777=Read expense reports of everybody
+Permission777=Llegeix els informes de despeses de tothom
-Permission778=Create/modify expense reports of everybody
+Permission778=Crea/modifica informes de despeses de tothom
 Permission779=Exportar informes de despeses
 Permission1001=Consultar stocks
 Permission1002=Crear/modificar els magatzems
@@ -884,7 +899,9 @@ Permission1185=Aprova les comandes de compra
 Permission1186=Envia comandes de compra
 Permission1187=Rebut de confirmació de comandes de compra
 Permission1188=Suprimeix comandes de compra
+Permission1189=Marca/Desmarca la recepció d’una comanda de compra
 Permission1190=Aprova (segona aprovació) les comandes de compra 
+Permission1191=Exporta les comandes dels proveïdors i els seus atributs
 Permission1201=Obté el resultat d'una exportació
 Permission1202=Crear/modificar exportacions
 Permission1231=Consulta factures de proveïdor
@@ -898,6 +915,8 @@ Permission1251=Llançar les importacions en massa a la base de dades (càrrega d
 Permission1321=Exporta factures de client, atributs i cobraments
 Permission1322=Reobrir una factura pagada
 Permission1421=Exporta ordres de vendes i atributs
+Permission1521=Consulta documents
+Permission1522=Elimina documents
 Permission2401=Llegeix les accions (esdeveniments o tasques) enllaçades amb el seu compte d’usuari (si és propietari d’un esdeveniment o només el té assignat)
 Permission2402=Crear / modificar accions (esdeveniments o tasques) enllaçades amb el seu compte d'usuari (si és propietari de l'esdeveniment)
 Permission2403=Suprimeix les accions (esdeveniments o tasques) enllaçades al seu compte d'usuari (si és propietari de l'esdeveniment)
@@ -912,7 +931,7 @@ Permission2515=Configuració carpetes de documents
 Permission2801=Utilitzar el client FTP en mode lectura (només explorar i descarregar)
 Permission2802=Utilitzar el client FTP en mode escriptura (esborrar o pujar arxius)
 Permission3200=Llegiu els esdeveniments arxivats i les empremtes dactilars
-Permission3301=Generate new modules
+Permission3301=Genera nous mòduls
 Permission4001=Vegeu empleats
 Permission4002=Crea empleats
 Permission4003=Suprimeix els empleats
@@ -932,9 +951,13 @@ Permission23001=Consulta les tasques programades
 Permission23002=Crear/Modificar les tasques programades
 Permission23003=Eliminar tasques programades
 Permission23004=Executar tasca programada
-Permission50101=Utilitza el punt de venda
+Permission50101=Utilitza el Punt de venda (SimplePOS)
+Permission50151=Utilitza el Punt de venda (TakePOS)
 Permission50201=Consultar les transaccions
 Permission50202=Importar les transaccions
+Permission50330=Consulta objectes de Zapier
+Permission50331=Crea/actualitza objectes de Zapier
+Permission50332=Elimina objectes de Zapier
 Permission50401=Enllaçar productes i factures amb comptes comptables
 Permission50411=Llegeix les operacions en el llibre major
 Permission50412=Escriure / editar les operacions en el llibre major
@@ -958,6 +981,17 @@ Permission63001=Consulta recursos
 Permission63002=Crea/modifica recursos
 Permission63003=Elimina recursos
 Permission63004=Enllaça recursos en esdeveniments de l'agenda
+Permission64001=Permet la impressió directa
+Permission67000=Permet imprimir rebuts
+Permission68001=Consulta l'informe intracomm
+Permission68002=Crea/modifica un informe intracomm
+Permission68004=Elimina l'informe intracomm
+Permission941601=Llegeix els rebuts
+Permission941602=Crea i modifica rebuts
+Permission941603=Valida els rebuts
+Permission941604=Envia rebuts per correu electrònic
+Permission941605=Exporta rebuts
+Permission941606=Esborra els rebuts
 DictionaryCompanyType=Tipus de tercer
 DictionaryCompanyJuridicalType=Formes jurídiques de tercers
 DictionaryProspectLevel=Nivell potencial de perspectiva per a empreses
@@ -997,6 +1031,8 @@ DictionaryHolidayTypes=Tipus de dies lliures
 DictionaryOpportunityStatus=Estat de d'oportunitat pel projecte/oportunitat
 DictionaryExpenseTaxCat=Informe de despeses - Categories de transport
 DictionaryExpenseTaxRange=Informe de despeses - Rang per categoria de transport
+DictionaryTransportMode=Informe intracomm: mode de transport
+TypeOfUnit=Tipus d’unitat
 SetupSaved=Configuració desada
 SetupNotSaved=Configuració no desada
 BackToModuleList=Torna a la llista de mòduls
@@ -1047,6 +1083,7 @@ LabelUsedByDefault=Etiqueta utilitzada per defecte si no es troba cap traducció
 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
 AtEndOfMonth=A final de mes
 CurrentNext=Actual/Següent
@@ -1091,7 +1128,7 @@ LoginPage=Pàgina de login
 BackgroundImageLogin=Imatge de fons
 PermanentLeftSearchForm=Zona de recerca permanent del menú de l'esquerra
 DefaultLanguage=Idioma per defecte
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Activa el suport multilingüe per a les relacions amb el client o el proveïdor
 EnableShowLogo=Mostra el logotip de l'organització al menú
 CompanyInfo=Empresa/Organització
 CompanyIds=Identitats d'empresa/organització
@@ -1145,6 +1182,7 @@ InfoWebServer=Sobre Servidor web
 InfoDatabase=Sobre Base de dades
 InfoPHP=Sobre PHP
 InfoPerf=Sobre prestacions
+InfoSecurity=Quant a la seguretat
 BrowserName=Nom del navegador
 BrowserOS=S.O. del navegador
 ListOfSecurityEvents=Llistat d'esdeveniments de seguretat Dolibarr
@@ -1194,11 +1232,12 @@ RestoreDesc=Per 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.
 RestoreMySQL=Importació MySQL
-ForcedToByAModule= Aquesta regla està forçada a <b>%s</b> per un dels mòduls activats
+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.
 PreviousDumpFiles=Fitxers de còpia de seguretat existents
 PreviousArchiveFiles=Fitxers d’arxiu existents
 WeekStartOnDay=Primer dia de la setmana
-RunningUpdateProcessMayBeRequired=Sembla necessari realitzar el procés d'actualizació (la versió del programa %s difereix de la versió de la base de dades %s)
+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
@@ -1282,7 +1321,7 @@ GetBarCode=Obté el codi de barres
 NumberingModules=Models de numeració
 DocumentModules=Models de documents
 ##### Module password generation
-PasswordGenerationStandard=Retorna una contrasenya generada per l'algoritme intern Dolibarr: 8 caràcters, números i caràcters en minúscules barrejades.
+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ó
@@ -1378,7 +1417,7 @@ MembersSetup=Configuració del mòdul Socis
 MemberMainOptions=Opcions principals
 AdherentLoginRequired= Gestiona un compte d'usuari per a cada soci
 AdherentMailRequired=Es necessita un correu electrònic per crear un nou membre
-MemberSendInformationByMailByDefault=Casella de verificació per enviar un missatge de confirmació als socis (validació o nova subscripció) activada per defecte
+MemberSendInformationByMailByDefault=La casella de selecció per enviar una confirmació per correu electrònic als socis (validació o nova subscripció) està activada per defecte
 VisitorCanChooseItsPaymentMode=El visitant pot triar entre els modes de pagament disponibles
 MEMBER_REMINDER_EMAIL=Activa el recordatori automàtic <b> per correu electrònic </b> de les subscripcions caducades. Nota: El mòdul <strong> %s </strong> s'ha d'habilitar i configurar correctament per enviar recordatoris.
 ##### LDAP setup #####
@@ -1523,7 +1562,9 @@ LDAPDescValues=Els valors d'exemples s'adapten a <b>OpenLDAP</b> amb els schemas
 ForANonAnonymousAccess=Per un accés autentificat
 PerfDolibarr=Configuració rendiment/informe d'optimització
 YouMayFindPerfAdviceHere=Aquesta pàgina ofereix alguns controls o consells relacionats amb el rendiment.
-NotInstalled=No està instal·lat, de manera que el vostre servidor no s'alenteix amb això.
+NotInstalled=No està instal·lat.
+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=Mòdul de memoria cache actiu, però la configuració del mòdul no està completa.
@@ -1571,9 +1612,9 @@ SyslogLevel=Nivell
 SyslogFilename=Nom i ruta de l'arxiu
 YouCanUseDOL_DATA_ROOT=Utilitza DOL_DATA_ROOT/dolibarr.log per un fitxer de registre en la carpeta documents de Dolibarr. Tanmateix, es pot definir una carpeta diferent per guardar aquest fitxer.
 ErrorUnknownSyslogConstant=La constant %s no és una constant syslog coneguda
-OnlyWindowsLOG_USER=Windows només suporta LOG_USER
+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=Còpies del log
+SyslogFileNumberOfSaves=Número de còpies de seguretat de logs a conservar
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configura la tasca programada de neteja per establir la freqüència de còpia de seguretat del registre
 ##### Donations #####
 DonationsSetup=Configuració del mòdul donacions
@@ -1595,7 +1636,7 @@ BarcodeDescDATAMATRIX=Codi de barres de tipus Datamatrix
 BarcodeDescQRCODE=Codi de barres de tipus QR
 GenbarcodeLocation=Generador de codi de barres (utilitzat pel motor intern per a alguns tipus de codis de barres). Ha de ser compatible amb "genbarcode".<br>Per exemple: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor intern
-BarCodeNumberManager=Configuració de la numeració automatica de codis de barres
+BarCodeNumberManager=Gestor per definir automàticament els números de codi de barres
 ##### Prelevements #####
 WithdrawalsSetup=Configuració dels pagaments de dèbit directe del mòdul
 ##### ExternalRSS #####
@@ -1607,7 +1648,7 @@ RSSUrlExample=Un flux RSS interessant
 MailingSetup=Configuració del mòdul E-Mailing
 MailingEMailFrom=Correu electrònic del remitent (des de) per a correus electrònics enviats per mòdul de correu electrònic
 MailingEMailError=Retornar correus electrònics (errors) a correus electrònics amb errors
-MailingDelay=Segons d'espera despres d'enviar el missatge següent
+MailingDelay=Segons d'espera després d'enviar el següent missatge
 ##### Notification #####
 NotificationSetup=Configuració del mòdul de notificació per correu electrònic
 NotificationEMailFrom=Correu electrònic del remitent (des de) per als correus electrònics enviats pel mòdul de notificacions
@@ -1639,11 +1680,11 @@ StockSetup=Configuració del mòdul de Estoc
 IfYouUsePointOfSaleCheckModule=Si utilitzeu el mòdul Point of Sale (POS) proporcionat per defecte o un mòdul extern, aquesta configuració pot ser ignorada pel vostre mòdul POS. La majoria dels mòduls de POS estan dissenyats per defecte per crear una factura immediatament i disminuir l'estoc, independentment de les opcions aquí. Així, si necessiteu o no una disminució de les existències al registrar una venda de la vostra TPV, consulteu també la vostra configuració del mòdul POS.
 ##### Menu #####
 MenuDeleted=Menú eliminat
+Menu=Menú
 Menus=Menús
 TreeMenuPersonalized=Menús personalitzats
 NotTopTreeMenuPersonalized=Els menús personalitzats no estan enllaçats a una entrada de menú de capçalera
 NewMenu=Nou menú
-Menu=Selecció dels menús
 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)
@@ -1779,7 +1820,7 @@ OpenFiscalYear=Obrir any fiscal
 CloseFiscalYear=Tancar any fiscal
 DeleteFiscalYear=Eliminar any fiscal
 ConfirmDeleteFiscalYear=Esteu segur d'eliminar aquest any fiscal?
-ShowFiscalYear=Mostrar periode contable
+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)
 NbMajMin=Nombre mínim de caràcters en majúscules
@@ -1794,7 +1835,6 @@ TypePaymentDesc=0:Forma de pagament a client, 1:Forma de pagament a proveïdor,
 IncludePath=Incloure ruta (que es defineix a la variable %s)
 ExpenseReportsSetup=Configuració del mòdul Informe de Despeses
 TemplatePDFExpenseReports=Mòdels de documentació per generar informes de despeses
-ExpenseReportsIkSetup=Configurar mòdul Informe de despeses - Índex milles
 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
@@ -1864,7 +1904,7 @@ MailToSendReception=Recepcions
 MailToThirdparty=Tercers
 MailToMember=Socis
 MailToUser=Usuaris
-MailToProject=Pàgina de projectes
+MailToProject=Projectes
 MailToTicket=Tiquets
 ByDefaultInList=Mostra per defecte en la vista del llistat
 YouUseLastStableVersion=Estàs utilitzant l'última versió estable
@@ -1872,9 +1912,9 @@ TitleExampleForMajorRelease=Exemple de missatge que es pot utilitzar per anuncia
 TitleExampleForMaintenanceRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de manteniment (ets lliure d'utilitzar-ho a les teves webs)
 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.
-MultiPriceRuleDesc=Quan s'activa l'opció "Diversos nivells de preus per producte / servei", podeu definir preus diferents (un per preu) per a cada producte. Per estalviar-vos temps, aquí podeu introduir una regla per calcular automàticament un preu per a cada nivell en funció del preu del primer nivell, de manera que només haureu d'introduir un preu del primer nivell per a cada producte. Aquesta pàgina està dissenyada per estalviar temps, però és útil només si els preus de cada nivell són relatius al primer nivell. Podeu ignorar aquesta pàgina en la majoria dels casos.
+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=Templates for documents of warehouses
+WarehouseModelModules=Plantilles per a documents de magatzems
 ToGenerateCodeDefineAutomaticRuleFirst=Per poder generar codis automàticament, primer heu de definir un gestor per definir automàticament el número del codi de barres.
 SeeSubstitutionVars=Veure * nota per llistat de possibles variables de substitució
 SeeChangeLog=Veure el fitxer ChangeLog (només en anglès)
@@ -1953,16 +1993,18 @@ NothingProcessed=No s'ha fet res
 XEmailsDoneYActionsDone=%s correus electrònics qualificats, %s correus electrònics processats amb èxit (per %s registre / accions realitzades)
 RecordEvent=Registre d'esdeveniments de correu electrònic
 CreateLeadAndThirdParty=Crea Client Potencial (i tercer si és necessari)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+CreateTicketAndThirdParty=Crea un tiquet (i enllaça'l amb un tercer si es va carregar amb una operació anterior)
 CodeLastResult=Últim codi retornat
 NbOfEmailsInInbox=Nombre de correus electrònics en el directori font
 LoadThirdPartyFromName=Carregueu la cerca de tercers al %s (només carrega)
 LoadThirdPartyFromNameOrCreate=Carregueu la cerca de tercers a %s (crear si no es troba)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic enviat des de Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithoutDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic NO enviat des de Dolibarr
-CreateCandidature=Create candidature
+WithDolTrackingIDInMsgId=Missatge enviat des de Dolibarr
+WithoutDolTrackingIDInMsgId=Missatge NO enviat des de Dolibarr
+CreateCandidature=Crea candidatura
 FormatZip=Codi postal
-MainMenuCode=Codi d'entrada del menú (menu principal)
+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.
 OpeningHours=Horari d'obertura
@@ -1974,7 +2016,7 @@ DisabledResourceLinkContact=Desactiva la funció per enllaçar un recurs als con
 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)
-DisableProspectCustomerType=Desactiveu el tipus de tercers "Prospect + Customer" (per tant, un tercer ha de ser Client o Client Potencial, però no pot ser ambdues)
+DisableProspectCustomerType=Desactiva el tipus de tercer "Potencial + Client" (per tant, el tercer ha de ser "Potencial" o "Client", però no pot ser tots dos)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplifica la interfície per a persones cegues
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activa aquesta opció si ets cec o si fas servir l'aplicació des d'un navegador de text com ara Lynx o Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Canvia el color de la interfície per daltònic
@@ -1996,13 +2038,15 @@ UseDebugBar=Utilitzeu la barra de depuració
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre d’últimes línies de registre que cal mantenir a la consola
 WarningValueHigherSlowsDramaticalyOutput=Advertència, els valors més alts frenen molt la producció
 ModuleActivated=El mòdul %s està activat i alenteix la interfície
+IfYouAreOnAProductionSetThis=Si esteu en un entorn de producció, s'hauria d'establir aquesta propietat en %s.
+AntivirusEnabledOnUpload=Antivirus activat als fitxers penjats
 EXPORTS_SHARE_MODELS=Els models d’exportació es comparteixen amb tothom
 ExportSetup=Configuració del mòdul Export
 ImportSetup=Configuració del mòdul Import
 InstanceUniqueID=ID únic de la instància
 SmallerThan=Menor que
 LargerThan=Major que
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+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 utilitzar el contingut de correu electrònic per cercar i carregar una tercera part existent a la base de dades. La tercera part trobada (o creada) s'utilitzarà per a les accions que ho necessitin. Al camp del paràmetre podeu fer servir, per exemple, 'EXTRACT:BODY:Name:\\s([^\\s]*)' si voleu extreure el nom de la tercera part d'una cadena "Name: nom a trobar" que es troba a la cos.
@@ -2029,4 +2073,10 @@ MeasuringScaleDesc=La escala és el nombre de llocs que heu de moure la part dec
 TemplateAdded=S'ha afegit la plantilla
 TemplateUpdated=Plantilla actualitzada
 TemplateDeleted=S'ha suprimit la plantilla
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Correu electrònic de recordatori d'esdeveniments
+SwitchThisForABetterSecurity=Es recomana canviar aquest valor a %s per 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ó.

htdocs/langs/ca_ES/agenda.lang

@@ -86,8 +86,8 @@ ProposalDeleted=Pressupost esborrat
 OrderDeleted=Comanda esborrada
 InvoiceDeleted=Factura esborrada
 DraftInvoiceDeleted=S'ha suprimit l'esborrany de factura
-CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_CREATEInDolibarr=S'ha creat el contacte %s
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_DELETEInDolibarr=S'ha eliminat el contacte %s
 PRODUCT_CREATEInDolibarr=Producte %s creat
 PRODUCT_MODIFYInDolibarr=Producte %s modificat
 PRODUCT_DELETEInDolibarr=Producte %s eliminat
@@ -115,10 +115,10 @@ BOM_CLOSEInDolibarr=Llista de materials desactivada
 BOM_REOPENInDolibarr=Llista de materials reoberta
 BOM_DELETEInDolibarr=Llista de materials eliminada
 MRP_MO_VALIDATEInDolibarr=OF validada
-MRP_MO_UNVALIDATEInDolibarr=S'ha definit l'estatus esborrany per a l'Ordre de Fabricació (MO)
+MRP_MO_UNVALIDATEInDolibarr=OF definida a l'estat d'esborrany
 MRP_MO_PRODUCEDInDolibarr=OF fabricada
 MRP_MO_DELETEInDolibarr=OF eliminada
-MRP_MO_CANCELInDolibarr=S'ha cancel·lat l'Ordre de Fabricació (MO)
+MRP_MO_CANCELInDolibarr=OF cancel·lada
 ##### End agenda events #####
 AgendaModelModule=Plantilles de documents per esdeveniments
 DateActionStart=Data d'inici
@@ -152,6 +152,7 @@ ActionType=Tipus d'esdeveniment
 DateActionBegin=Data d'inici de l'esdeveniment
 ConfirmCloneEvent=Estàs segur que vols clonar l'esdeveniment <b>%s</b>?
 RepeatEvent=Repeteix esdeveniment
+OnceOnly=Una sola vegada
 EveryWeek=Cada setmana
 EveryMonth=Cada mes
 DayOfMonth=Dia del mes
@@ -160,9 +161,9 @@ DateStartPlusOne=Data d'inici + 1 hora
 SetAllEventsToTodo=Definir tots els events com a pendents
 SetAllEventsToInProgress=Definir tots els events en progrés
 SetAllEventsToFinished=Definir tots els events com a enllestits
-ReminderTime=Reminder period before the event
+ReminderTime=Període de recordatori abans de l'esdeveniment
-TimeType=Duration type
+TimeType=Tipus de durada
-ReminderType=Callback type
+ReminderType=Tipus de devolució de trucada
-AddReminder=Create an automatic reminder notification for this event
+AddReminder=Crea una notificació de recordatori automàtica per a aquest esdeveniment
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+ErrorReminderActionCommCreation=S'ha produït un error en crear la notificació de recordatori per a aquest esdeveniment
-BrowserPush=Browser Notification
+BrowserPush=Notificació del navegador

htdocs/langs/ca_ES/banks.lang

@@ -166,6 +166,9 @@ VariousPayment=Pagament divers
 VariousPayments=Pagaments varis
 ShowVariousPayment=Mostra pagaments diversos
 AddVariousPayment=Afegiu pagaments diversos
+VariousPaymentId=ID de pagament divers
+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

htdocs/langs/ca_ES/bills.lang

@@ -92,8 +92,8 @@ PaymentConditions=Condicions de pagament
 PaymentConditionsShort=Condicions de pagament
 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 la resta a pagar.<br>Corregiu la entrada, en cas contrari, confirmeu i pensi en crear un abonament d'allò percebut en excés per cada factura sobrepagada.
+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 la resta a pagar.<br>Corregiu la entrada, en cas contrari, confirmeu i pensi en crear un abonament d'allò percebut en excés per cada factura sobrepagada.
+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'
 ClassifyUnPaid=Classifica &quot;sense pagar&quot;
 ClassifyPaidPartially=Classificar 'Pagat parcialment'
@@ -298,7 +298,7 @@ CreditNotes=Abonaments
 CreditNotesOrExcessReceived=Notes de crèdit o excés rebut
 Deposit=Bestreta
 Deposits=Bestretes
-DiscountFromCreditNote=Descompte resultant del abonament %s
+DiscountFromCreditNote=Descompte de l'abonament %s
 DiscountFromDeposit=Pagaments de la factura de bestreta %s
 DiscountFromExcessReceived=Pagaments superiors a la factura %s
 DiscountFromExcessPaid=Pagaments superiors a la factura %s
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Contacte proveïdor serveis
 InvoiceFirstSituationAsk=Primera factura de situació
 InvoiceFirstSituationDesc=Les <b>factures de situació</b> estan vinculades a situacions relacionades amb una progressió, per exemple, la progressió d'una construcció. Cada situació està lligada a una factura.
 InvoiceSituation=Factura de situació
+PDFInvoiceSituation=Factura de situació
 InvoiceSituationAsk=Factura que segueix una situació
 InvoiceSituationDesc=Crear una nova situació seguint una altra existent
 SituationAmount=Import (sense IVA) de la factura de situació
@@ -560,7 +561,7 @@ ToCreateARecurringInvoiceGene=Per generar futures factures regulars i manualment
 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?
-CreateOneBillByThird=Crea una factura per tercer (per la resta, una factura per comanda)
+CreateOneBillByThird=Agrupa una factura per tercer (sinó, una factura per comanda)
 BillCreated=%s factura(es) creades
 StatusOfGeneratedDocuments=Estat de la generació de documents
 DoNotGenerateDoc=No generar cap fitxer de document
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=S'ha suprimit la factura de proveïdor
 UnitPriceXQtyLessDiscount=Descompte - Preu unitari x Quantitat
 CustomersInvoicesArea=Àrea de facturació del client
 SupplierInvoicesArea=Àrea de facturació del proveïdor
+FacParentLine=Línia de factura origen
+SituationTotalRayToRest=Resta a pagar sense impostos
+PDFSituationTitle=Situació núm. %d
+SituationTotalProgress=Progrés total %d %%

htdocs/langs/ca_ES/boxes.lang

@@ -45,7 +45,7 @@ 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
+BoxTitleLatestModifiedMos=Últimes %s ordres de fabricació modificades
 BoxGlobalActivity=Activitat global
 BoxGoodCustomers=Bons clients
 BoxTitleGoodCustomers=% bons clients
@@ -84,7 +84,7 @@ BoxTitleLastModifiedCustomerBills=Factures del client: últimes %s modificades
 BoxTitleLastModifiedCustomerOrders=Comandes de venda: últimes %s modificades
 BoxTitleLastModifiedPropals=Últims %s pressupostos modificats
 BoxTitleLatestModifiedJobPositions=Els darrers %s treballs modificats
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedCandidatures=Darreres candidatures modificades %s
 ForCustomersInvoices=Factures a clients
 ForCustomersOrders=Comandes de clients
 ForProposals=Pressupostos
@@ -104,3 +104,4 @@ BoxTitleLastCustomerShipments=Últims %s enviaments de clients
 NoRecordedShipments=Cap enviament de client registrat
 # Pages
 AccountancyHome=Comptabilitat
+ValidatedProjects=Projectes validats

htdocs/langs/ca_ES/cashdesk.lang

@@ -77,29 +77,29 @@ POSModule=Mòdul TPV
 BasicPhoneLayout=Utilitzeu el disseny bàsic dels telèfons
 SetupOfTerminalNotComplete=La configuració del terminal %s no està completa
 DirectPayment=Pagament directe
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Afegeix un botó "Pagament directe en efectiu"
 InvoiceIsAlreadyValidated=La factura ja està validada
 NoLinesToBill=No hi ha línies a facturar
 CustomReceipt=Rebut personalitzat
 ReceiptName=Nom del rebut
 ProductSupplements=Suplements de producte
 SupplementCategory=Categoria de suplement
-ColorTheme=Tema del color
+ColorTheme=Color del tema
 Colorful=Colorit
 HeadBar=Barra de capçalera
-SortProductField=Camp per ordenar productes
+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.
 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=Use icon instead of text on payment buttons of numpad
+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
 TakeposGroupSameProduct=Agrupa les mateixes línies de productes
 StartAParallelSale=Inicia una nova venda paral·lela
-ControlCashOpening=Control cash box at opening POS
+ControlCashOpening=Control de caixa en obrir el TPV
 CloseCashFence=Tanca el recompte d'efectiu
 CashReport=Informe d'efectiu
 MainPrinterToUse=Impressora principal a utilitzar
@@ -117,8 +117,9 @@ HideCategoryImages=Amaga les imatges de la categoria
 HideProductImages=Amaga les imatges del producte
 NumberOfLinesToShow=Nombre de línies d'imatges a mostrar
 DefineTablePlan=Definiu el pla de les taules
-GiftReceiptButton=Add a "Gift receipt" button
+GiftReceiptButton=Afegiu un botó "Rebut de regal"
 GiftReceipt=Rebut de regal
 ModuleReceiptPrinterMustBeEnabled=La impressora de recepció del mòdul deu haver estat habilitada primer
-AllowDelayedPayment=Allow delayed payment
+AllowDelayedPayment=Permet un pagament retardat
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+PrintPaymentMethodOnReceipts=Imprimeix el mètode de pagament en els tiquets/rebuts
+WeighingScale=Balança de pesatge

htdocs/langs/ca_ES/categories.lang

@@ -84,7 +84,7 @@ AddProductServiceIntoCategory=Afegir el següent producte/servei
 ShowCategory=Mostra etiqueta
 ByDefaultInList=Per defecte en el llistat
 ChooseCategory=Tria la categoria
-StocksCategoriesArea=Zona de categories de magatzems
+StocksCategoriesArea=Categories de magatzems
-ActionCommCategoriesArea=Àrea d'etiquetes d'esdeveniments
+ActionCommCategoriesArea=Categories d'esdeveniments
-WebsitePagesCategoriesArea=Àrea de categories de Pàgines/Contenidors
+WebsitePagesCategoriesArea=Categories de Pàgines/Contenidors
 UseOrOperatorForCategories=Us o operador per categories

htdocs/langs/ca_ES/companies.lang

@@ -354,6 +354,7 @@ VATIntraManualCheck=Podeu també fer una verificació manual a la web de la comi
 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
+Workforce=Força de treball
 Staff=Empleats
 ProspectLevelShort=Potencial
 ProspectLevel=Nivell de client potencial
@@ -456,3 +457,8 @@ PaymentTermsSupplier=Condicions de pagament - Proveïdor
 PaymentTypeBoth=Tipus de pagament: client i proveïdor
 MulticurrencyUsed=Emprar Multidivisa
 MulticurrencyCurrency=Divisa
+InEEC=Europa (CEE)
+RestOfEurope=Resta d'Europa (CEE)
+OutOfEurope=Fora d’Europa (CEE)
+CurrentOutstandingBillLate=Factura pendent actual en retard
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ves amb compte, en funció de la configuració del preu del producte, has de canviar de tercer abans d’afegir el producte al TPV.

htdocs/langs/ca_ES/compta.lang

@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Mostra un registre al vostre Llibre Major amb
 SeePageForSetup=Veure el menú <a href="%s"> %s </a> per configurar-lo
 DepositsAreNotIncluded=- Les factures de bestreta no estan incloses
 DepositsAreIncluded=- Les factures de bestreta estan incloses
+LT1ReportByMonth=Informe RE per mes
+LT2ReportByMonth=Informe IRPF per mes
 LT1ReportByCustomers=Informe impost 2 per part de tercers
 LT2ReportByCustomers=Informe impost 3 per part de tercers
 LT1ReportByCustomersES=Informe de RE per tercers
 LT2ReportByCustomersES=Informe per tercer del IRPF
 VATReport=Informe d'IVA de vendes
 VATReportByPeriods=Informe d'impostos sobre vendes per període
+VATReportByMonth=Informe de l'impost sobre les vendes per mes
 VATReportByRates=Informe d'impostos sobre vendes per taxes
 VATReportByThirdParties=Informe d'impostos sobre vendes per tercers
 VATReportByCustomers=Informe d'IVA sobre vendes per client
@@ -234,7 +237,7 @@ ACCOUNTING_ACCOUNT_SUPPLIER_Desc=El compte comptable dedicat definit a la fitxa
 ConfirmCloneTax=Confirma el clonat d'un impost social / fiscal
 CloneTaxForNextMonth=Clonar-la pel pròxim mes
 SimpleReport=Informe simple
-AddExtraReport=Informes extra (afegeix informes de clients extrangers i nacionals)
+AddExtraReport=Informes addicionals (afegeix l'informe de clients nacionals i estrangers)
 OtherCountriesCustomersReport=Informe de clients estrangers
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basat en les dues primeres lletres del CIF que són diferents del codi de país de la teva empresa
 SameCountryCustomersWithVAT=Informe de clients nacionals

htdocs/langs/ca_ES/cron.lang

@@ -14,6 +14,7 @@ FileToLaunchCronJobs=Línia de comando per verificar i executar tasques cron qua
 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
+CronMethodNotAllowed=El mètode %s de la classe %s es troba a la llista negra de mètodes prohibits
 CronJobDefDesc=Els perfils de tasques programades es defineixen a la fitxa del mòdul descriptor. Quan s'activa el mòdul, es carreguen i estan disponibles per poder administrar les tasques des del menú d'eines d'administració %s.
 CronJobProfiles=Llista de perfils predefinits de tasques programades
 # Menu
@@ -27,9 +28,9 @@ CronDelete=Elimina les tasques programades
 CronConfirmDelete=Vols eliminar aquests treballs programats?
 CronExecute=Llança la tasca programada
 CronConfirmExecute=Esteu segur que voleu executar aquestes tasques programades ara?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronInfo=El mòdul de tasques programades permet programar tasques per executar-les automàticament. Les tasques també es poden iniciar manualment.
 CronTask=Tasca
-CronNone=Ningún
+CronNone=Cap
 CronDtStart=No abans
 CronDtEnd=No després
 CronDtNextLaunch=Propera execució
@@ -46,6 +47,7 @@ CronNbRun=Nº execucions
 CronMaxRun=Número màxim d'execucions
 CronEach=Tota (s)
 JobFinished=Tasques llançades i finalitzades
+Scheduled=Programat
 #Page card
 CronAdd= Afegir una tasca
 CronEvery=Executa cada tasca
@@ -56,7 +58,7 @@ CronNote=Nota
 CronFieldMandatory=El camp %s és obligatori
 CronErrEndDateStartDt=La data de fi no pot ser anterior a la d'inici
 StatusAtInstall=Estat a la instal·lació del mòdul
-CronStatusActiveBtn=Activar
+CronStatusActiveBtn=Programa-ho
 CronStatusInactiveBtn=Desactivar
 CronTaskInactive=Aquesta tasca es troba desactivada
 CronId=Id