diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 2b263ca166c..fe797cc3e06 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -42,6 +42,21 @@ $page = GETPOST("page");
 $sortorder = GETPOST("sortorder", 'alpha');
 $sortfield = GETPOST("sortfield", 'alpha');
 $action = GETPOST('action', 'alpha');
+if (GETPOST("exportcsv",'alpha')) $action = 'export_csv';
+
+// Load variable for pagination
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if (empty($page) || $page == -1 || GETPOST('button_search','alpha') || GETPOST('button_removefilter','alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+//if (! $sortfield) $sortfield="p.date_fin";
+//if (! $sortorder) $sortorder="DESC";
+
+
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
 $search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 
@@ -54,14 +69,6 @@ if ($search_accountancy_code_end == - 1) {
 	$search_accountancy_code_end = '';
 }
 
-if (GETPOST("exportcsv",'alpha')) $action = 'export_csv';
-
-
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):$conf->liste_limit;
-if (empty($page) || $page < 0) { $page = 0; }
-
-$offset = $limit * $page;
-
 $object = new BookKeeping($db);
 
 $formaccounting = new FormAccounting($db);
@@ -97,23 +104,27 @@ if ($sortorder == "")
 if ($sortfield == "")
 	$sortfield = "t.numero_compte";
 
-$options = '';
+
+$param='';
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+
 $filter = array ();
 if (! empty($search_date_start)) {
 	$filter['t.doc_date>='] = $search_date_start;
-	$options .= '&amp;date_startmonth=' . GETPOST('date_startmonth', 'int') . '&amp;date_startday=' . GETPOST('date_startday', 'int') . '&amp;date_startyear=' . GETPOST('date_startyear', 'int');
+	$param .= '&amp;date_startmonth=' . GETPOST('date_startmonth', 'int') . '&amp;date_startday=' . GETPOST('date_startday', 'int') . '&amp;date_startyear=' . GETPOST('date_startyear', 'int');
 }
 if (! empty($search_date_end)) {
 	$filter['t.doc_date<='] = $search_date_end;
-	$options .= '&amp;date_endmonth=' . GETPOST('date_endmonth', 'int') . '&amp;date_endday=' . GETPOST('date_endday', 'int') . '&amp;date_endyear=' . GETPOST('date_endyear', 'int');
+	$param .= '&amp;date_endmonth=' . GETPOST('date_endmonth', 'int') . '&amp;date_endday=' . GETPOST('date_endday', 'int') . '&amp;date_endyear=' . GETPOST('date_endyear', 'int');
 }
 if (! empty($search_accountancy_code_start)) {
 	$filter['t.numero_compte>='] = $search_accountancy_code_start;
-	$options .= '&amp;search_accountancy_code_start=' . $search_accountancy_code_start;
+	$param .= '&amp;search_accountancy_code_start=' . $search_accountancy_code_start;
 }
 if (! empty($search_accountancy_code_end)) {
 	$filter['t.numero_compte<='] = $search_accountancy_code_end;
-	$options .= '&amp;search_accountancy_code_end=' . $search_accountancy_code_end;
+	$param .= '&amp;search_accountancy_code_end=' . $search_accountancy_code_end;
 }
 
 
@@ -130,8 +141,8 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$filter = array();
 }
 
-if ($action == 'export_csv') {
-
+if ($action == 'export_csv')
+{
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
 	$filename = 'balance';
@@ -193,7 +204,8 @@ if ($action != 'export_csv')
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
 	$button = '<input type="submit" name="exportcsv" class="butAction" value="' . $langs->trans("Export") . ' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
-	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, $button, $result, $result, 'title_accountancy', 0);
+
+	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	$moreforfilter = '';
 
@@ -231,12 +243,12 @@ if ($action != 'export_csv')
 	print '</tr>';
 
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
-	print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $options, "", $sortfield, $sortorder);
-	print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $options, "", 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+	print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 	print "</tr>\n";
 
 	$total_debit = 0;
@@ -262,7 +274,7 @@ if ($action != 'export_csv')
 		{
 			// Affiche un Sous-Total par compte comptable
 			if ($displayed_account != "") {
-				print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">' . price($sous_total_debit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit - $sous_total_debit) . '</td>';
+				print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">' . price($sous_total_debit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit) . '</td><td class="nowrap" align="right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
 				print "<td>&nbsp;</td>\n";
 				print '</tr>';
 			}
@@ -293,11 +305,11 @@ if ($action != 'export_csv')
 		$sous_total_credit += $line->credit;
 	}
 
-	print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">' . price($sous_total_debit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit - $sous_total_debit) . '</td>';
+	print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">' . price($sous_total_debit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit) . '</td><td class="nowrap" align="right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 
-	print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("AccountBalance") . ':</td><td class="nowrap" align="right">' . price($total_debit) . '</td><td class="nowrap" align="right">' . price($total_credit) . '</td><td class="nowrap" align="right">' . price($total_credit - $total_debit) . '</td>';
+	print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("AccountBalance") . ':</td><td class="nowrap" align="right">' . price($total_debit) . '</td><td class="nowrap" align="right">' . price($total_credit) . '</td><td class="nowrap" align="right">' . price(price2num($total_credit - $total_debit)) . '</td>';
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 060efab591c..13fec3cf388 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -651,19 +651,39 @@ class AccountancyExport
 	 */
 	public function exportFEC($objectLines)
 	{
-		$separator = ';';
+		$separator = "\t";
 		$end_line = "\n";
 
+		print "JournalCode" . $separator;
+		print "JournalLib" . $separator;
+		print "EcritureNum" . $separator;
+		print "EcritureDate" . $separator;
+		print "CompteNum" . $separator;
+		print "CompteLib" . $separator;
+		print "CompAuxNum" . $separator;
+		print "CompAuxLib" . $separator;
+		print "PieceRef" . $separator;
+		print "PieceDate" . $separator;
+		print "EcritureLib" . $separator;
+		print "Debit" . $separator;
+		print "Credit" . $separator;
+		print "EcritureLet" . $separator;
+		print "DateLet" . $separator;
+		print "ValidDate" . $separator;
+		print "Montantdevise" . $separator;
+		print "Idevise";
+		print $end_line;
+
 		foreach ( $objectLines as $line ) {
 			$date_creation = dol_print_date($line->date_creation, '%d%m%Y');
 			$date_doc = dol_print_date($line->doc_date, '%d%m%Y');
 			$date_valid = dol_print_date($line->date_validated, '%d%m%Y');
 
 			// FEC:JournalCode
-			print $line->code_journal;
+			print $line->code_journal . $separator;
 
 			// FEC:JournalLib
-			print $line->journal_label;
+			print $line->journal_label . $separator;
 
 			// FEC:EcritureNum
 			print $line->piece_num . $separator;
@@ -693,10 +713,10 @@ class AccountancyExport
 			print $line->label_operation . $separator;
 
 			// FEC:Debit
-			print price($line->debit) . $separator;
+			print price2num($line->debit) . $separator;
 
 			// FEC:Credit
-			print price($line->credit) . $separator;
+			print price2num($line->credit) . $separator;
 
 			// FEC:EcritureLet
 			print $line->lettering_code . $separator;
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 5e9350b0366..b228588b90f 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1016,16 +1016,21 @@ class BookKeeping extends CommonObject
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql) {
+		if ($resql)
+		{
 			$num = $this->db->num_rows($resql);
 
-			while ( $obj = $this->db->fetch_object($resql) ) {
+			$i = 0;
+			while (($obj = $this->db->fetch_object($resql)) && ($i < min($limit, $num)))
+			{
 				$line = new BookKeepingLine();
 
 				$line->numero_compte = $obj->numero_compte;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
 				$this->lines[] = $line;
+
+				$i++;
 			}
 			$this->db->free($resql);
 
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 23dcc7f9932..29c05eb5516 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -146,9 +146,12 @@ if ($conf->accounting->enabled)
 	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."\n";
 	print "<br>\n";
 
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."\n";
-	print "<br>\n";
+	if (! empty($conf->expensereport->enabled) || ! empty($conf->deplacement->enabled))
+	{
+		$step++;
+		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."\n";
+		print "<br>\n";
+	}
 
 	$step++;
 	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64+$step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index 773f7a7ff68..1d7e7fd6f54 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2015  Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2016  Charlie Benke		<charlie@patas-monkey.com>
+/* Copyright (C) 2015-2018  Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2016       Charlie Benke		<charlie@patas-monkey.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,11 +27,21 @@ $code = $conf->global->MAIN_INFO_ACCOUNTANT_CODE;
 $prefix = $conf->global->ACCOUNTING_EXPORT_PREFIX_SPEC;
 $format = $conf->global->ACCOUNTING_EXPORT_FORMAT;
 $nodateexport = $conf->global->ACCOUNTING_EXPORT_NO_DATE_IN_FILENAME;
+$siren = $conf->global->MAIN_INFO_SIREN;
 
 $date_export = "_" . dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+$endaccountingperiod = dol_print_date(dol_now(), '%Y%m%d');
 
 header('Content-Type: text/csv');
 
-$completefilename = ($code?$code . "_":"") . ($prefix?$prefix . "_":"") . $filename . ($nodateexport?"":$date_export) . "." . $format;
+
+if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == "11") // Specific filename for FEC model export
+{
+	$completefilename = $siren . "FEC" . $search_date_end . $endaccountingperiod . "." . $format;
+}
+else
+{
+	$completefilename = ($code?$code . "_":"") . ($prefix?$prefix . "_":"") . $filename . ($nodateexport?"":$date_export) . "." . $format;
+}
 
 header('Content-Disposition: attachment;filename=' . $completefilename);
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 6c28081e6fc..cd84dbf65a5 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -238,6 +238,32 @@ if ($action == 'setforcedate')
     }
 }
 
+if ($action == 'setDefaultPDFModulesByType')
+{
+    $invoicetypemodels =  GETPOST('invoicetypemodels');
+    
+    if(!empty($invoicetypemodels) && is_array($invoicetypemodels))
+    {
+        $error = 0;
+        
+        foreach ($invoicetypemodels as $type => $value)
+        {
+            $res = dolibarr_set_const($db, 'FACTURE_ADDON_PDF_'.intval($type),$value,'chaine',0,'',$conf->entity);
+            if (! $res > 0) $error++;
+        }
+        
+        if (! $error)
+        {
+            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        }
+        else
+        {
+            setEventMessages($langs->trans("Error"), null, 'errors');
+        }
+    }
+    
+   
+}
 
 
 /*
@@ -465,6 +491,8 @@ print "</tr>\n";
 
 clearstatcache();
 
+$activatedModels = array();
+
 foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
@@ -580,6 +608,47 @@ foreach ($dirmodels as $reldir)
 }
 print '</table>';
 
+if(!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
+{
+    /*
+     *  Document templates generators
+     */
+    print '<br>';
+    print load_fiche_titre($langs->trans("BillsPDFModulesAccordindToInvoiceType"),'','');
+    print '<form action="'.$_SERVER["PHP_SELF"].'#default-pdf-modules-by-type-table" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+    print '<input type="hidden" name="action" value="setDefaultPDFModulesByType" >';
+    print '<table id="default-pdf-modules-by-type-table" class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print '<td>'.$langs->trans("Type").'</td>';
+    print '<td>'.$langs->trans("Name").'</td>';
+    print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+    print "</tr>\n";
+    
+    $listtype=array(
+        Facture::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
+        Facture::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
+        Facture::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
+        Facture::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
+    );
+    if (! empty($conf->global->INVOICE_USE_SITUATION))
+    {
+        $listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
+    }
+    
+    foreach ($listtype as $type => $trans)
+    {
+        $thisTypeConfName = 'FACTURE_ADDON_PDF_'.$type;
+        $current = !empty($conf->global->{$thisTypeConfName})?$conf->global->{$thisTypeConfName}:$conf->global->FACTURE_ADDON_PDF;
+        print '<tr >';
+        print '<td>'.$trans.'</td>';
+        print '<td colspan="2" >'.$form->selectarray('invoicetypemodels['.$type.']', ModelePDFFactures::liste_modeles($db), $current,0,0, 0).'</td>';
+        print "</tr>\n";
+    }
+    
+    print '</table>';
+    print "</form>";
+}
 
 /*
  *  Modes de reglement
@@ -662,6 +731,7 @@ if ($resql)
     $i = 0;
     while ($i < $num)
     {
+
         $row = $db->fetch_row($resql);
 
         print '<option value="'.$row[0].'"';
diff --git a/htdocs/asset/admin/assets_extrafields.php b/htdocs/asset/admin/assets_extrafields.php
index 109b0f1e94f..f220d5cb849 100644
--- a/htdocs/asset/admin/assets_extrafields.php
+++ b/htdocs/asset/admin/assets_extrafields.php
@@ -64,7 +64,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print load_fiche_titre($langs->trans("AssetsSetup"),$linkback,'title_setup');
 
 
-$head = AssetsAdminPrepareHead();
+$head = asset_admin_prepare_head();
 
 dol_fiche_head($head, 'attributes', $langs->trans("Assets"), -1, 'generic');
 
diff --git a/htdocs/asset/admin/assets_type_extrafields.php b/htdocs/asset/admin/assets_type_extrafields.php
index e8f1d71370b..a791078f37b 100644
--- a/htdocs/asset/admin/assets_type_extrafields.php
+++ b/htdocs/asset/admin/assets_type_extrafields.php
@@ -63,7 +63,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print load_fiche_titre($langs->trans("AssetsSetup"),$linkback,'title_setup');
 
 
-$head = AssetsAdminPrepareHead();
+$head = asset_admin_prepare_head();
 
 dol_fiche_head($head, 'attributes_type', $langs->trans("Assets"), -1, 'generic');
 
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 1168fd3ada3..57738309abd 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -58,7 +58,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print load_fiche_titre($langs->trans("AssetsSetup"),$linkback,'title_setup');
 
 
-$head = AssetsAdminPrepareHead();
+$head = asset_admin_prepare_head();
 
 dol_fiche_head($head, 'settings', $langs->trans("Assets"), -1, 'generic');
 
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 9af7638316f..4f7061aed20 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -203,7 +203,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 {
 	$res = $object->fetch_optionals($object->id, $extralabels);
 
-	$head = AssetsPrepareHead($object);
+	$head = asset_prepare_head($object);
 	dol_fiche_head($head, 'card', $langs->trans("Asset"), -1, 'generic');
 
 	$formconfirm = '';
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 784f65aa220..c1332ed10a2 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -95,7 +95,7 @@ if ($object->id)
 	 * Show tabs
 	 */
 	if (! empty($conf->notification->enabled)) $langs->load("mails");
-	$head = AssetsPrepareHead($object);
+	$head = asset_prepare_head($object);
 
 	dol_fiche_head($head, 'document', $langs->trans("Asset"), -1, 'generic');
 
diff --git a/htdocs/asset/info.php b/htdocs/asset/info.php
index 9cc9495c1b9..e01316ae685 100644
--- a/htdocs/asset/info.php
+++ b/htdocs/asset/info.php
@@ -55,7 +55,7 @@ $form = new Form($db);
 
 $object->info($id);
 
-$head = AssetsPrepareHead($object);
+$head = asset_prepare_head($object);
 
 dol_fiche_head($head, 'info', $langs->trans("Asset"), -1, 'generic');
 
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index e95e62aeaa4..f76c6ea028f 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -78,7 +78,7 @@ if ($id > 0 || ! empty($ref))
 {
 	$object->fetch_thirdparty();
 
-	$head = AssetsPrepareHead($object);
+	$head = asset_prepare_head($object);
 
 	dol_fiche_head($head, 'note', $langs->trans("Asset"), -1, 'generic');
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 4c6fbb2045c..3233dff3a4b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -348,13 +348,13 @@ if (empty($reshook))
 			// If we select proposal to clone during creation (when option PROPAL_CLONE_ON_CREATE_PAGE is on)
 			if (GETPOST('createmode') == 'copy' && GETPOST('copie_propal'))
 			{
-				if ($object->fetch(GETPOST('copie_propal')) > 0) {
+				if ($object->fetch(GETPOST('copie_propal','int')) > 0) {
 					$object->ref = GETPOST('ref');
 					$object->datep = $datep;
 					$object->date_livraison = $date_delivery;
 					$object->availability_id = GETPOST('availability_id');
 					$object->demand_reason_id = GETPOST('demand_reason_id');
-					$object->fk_delivery_address = GETPOST('fk_address');
+					$object->fk_delivery_address = GETPOST('fk_address','int');
 					$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 					$object->duree_validite = $duration;
 					$object->cond_reglement_id = GETPOST('cond_reglement_id');
@@ -362,9 +362,9 @@ if (empty($reshook))
 					$object->fk_account = GETPOST('fk_account', 'int');
 					$object->remise_percent = GETPOST('remise_percent');
 					$object->remise_absolue = GETPOST('remise_absolue');
-					$object->socid = GETPOST('socid');
-					$object->contactid = GETPOST('contactid');
-					$object->fk_project = GETPOST('projectid');
+					$object->socid = GETPOST('socid','int');
+					$object->contactid = GETPOST('contactid','int');
+					$object->fk_project = GETPOST('projectid','int');
 					$object->modelpdf = GETPOST('model');
 					$object->author = $user->id; // deprecated
 					$object->note_private = GETPOST('note_private','none');
@@ -391,8 +391,8 @@ if (empty($reshook))
 				$object->cond_reglement_id = GETPOST('cond_reglement_id');
 				$object->mode_reglement_id = GETPOST('mode_reglement_id');
 				$object->fk_account = GETPOST('fk_account', 'int');
-				$object->contactid = GETPOST('contactid');
-				$object->fk_project = GETPOST('projectid');
+				$object->contactid = GETPOST('contactid','int');
+				$object->fk_project = GETPOST('projectid','int');
 				$object->modelpdf = GETPOST('model');
 				$object->author = $user->id; // deprecated
 				$object->note_private = GETPOST('note_private','none');
@@ -566,6 +566,16 @@ if (empty($reshook))
 						}
 					}
 
+					if (! empty($conf->global->PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT))
+					{
+						$result = $object->add_contact($user->id, 'SALESREPFOLL', 'internal');
+						if ($result < 0)
+						{
+							$error++;
+							setEventMessages($langs->trans("ErrorFailedToAddUserAsContact"), null, 'errors');
+						}
+					}
+
 					if (! $error)
 					{
 						$db->commit();
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 4d538bfc68b..dd3fd890ccc 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2877,7 +2877,8 @@ if ($action == 'create')
 	// Standard invoice
 	print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 	$tmp='<input type="radio" id="radio_standard" name="type" value="0"' . (GETPOST('type') == 0 ? ' checked' : '') . '> ';
-	$desc = $form->textwithpicto($tmp.$langs->trans("InvoiceStandardAsk"), $langs->transnoentities("InvoiceStandardDesc"), 1, 'help', '', 0, 3);
+	$tmp  = $tmp.'<label for="radio_standard" >'.$langs->trans("InvoiceStandardAsk").'</label>';
+	$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceStandardDesc"), 1, 'help', '', 0, 3);
 	print $desc;
 	print '</div></div>';
 
@@ -2896,7 +2897,8 @@ if ($action == 'create')
     		});
     		</script>';
 
-			$desc = $form->textwithpicto($tmp.$langs->trans("InvoiceDeposit"), $langs->transnoentities("InvoiceDepositDesc"), 1, 'help', '', 0, 3);
+			$tmp  = $tmp.'<label for="radio_deposit" >'.$langs->trans("InvoiceDeposit").'</label>';
+			$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceDepositDesc"), 1, 'help', '', 0, 3);
 			print '<table class="nobordernopadding"><tr><td>';
 			print $desc;
 			print '</td>';
@@ -2920,8 +2922,9 @@ if ($action == 'create')
 		{
 			// First situation invoice
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-			$tmp='<input type="radio" name="type" value="5"' . (GETPOST('type') == 5 ? ' checked' : '') . '> ';
-			$desc = $form->textwithpicto($tmp.$langs->trans("InvoiceFirstSituationAsk"), $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3);
+			$tmp='<input id="radio_situation invoice" type="radio" name="type" value="5"' . (GETPOST('type') == 5 ? ' checked' : '') . '> ';
+			$tmp  = $tmp.'<label for="radio_situation invoice" >'.$langs->trans("InvoiceFirstSituationAsk").'</label>';
+			$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3);
 			print $desc;
 			print '</div></div>';
 
@@ -2931,7 +2934,7 @@ if ($action == 'create')
 			$tmp='<input type="radio" name="type" value="5"' . (GETPOST('type') == 5 && GETPOST('originid') ? ' checked' : '');
 			if ($opt == ('<option value ="0" selected>' . $langs->trans('NoSituations') . '</option>') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande')) $tmp.=' disabled';
 			$tmp.= '> ';
-			$text = $tmp.$langs->trans("InvoiceSituationAsk") . ' ';
+			$text = '<label>'.$tmp.$langs->trans("InvoiceSituationAsk") . '</label> ';
 			$text .= '<select class="flat" id="situations" name="situations">';
 			$text .= $opt;
 			$text .= '</select>';
@@ -2955,7 +2958,7 @@ if ($action == 'create')
     			});
     		});
     		</script>';
-			$text = $tmp.$langs->trans("InvoiceReplacementAsk") . ' ';
+			$text = '<label>'.$tmp.$langs->trans("InvoiceReplacementAsk") . '</label>';
 			$text .= '<select class="flat" name="fac_replacement" id="fac_replacement"';
 			if (! $options)
 				$text .= ' disabled';
@@ -2976,13 +2979,14 @@ if ($action == 'create')
 	{
 		print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 		$tmp='<input type="radio" name="type" id="radio_replacement" value="0" disabled> ';
-		$text = $tmp.$langs->trans("InvoiceReplacement") . ' ';
+		$text = '<label>'.$tmp.$langs->trans("InvoiceReplacement") . '</label> ';
 		$text.= '('.$langs->trans("YouMustCreateInvoiceFromThird").') ';
 		$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceReplacementDesc"), 1, 'help', '', 0, 3);
 		print $desc;
 		print '</div></div>';
 	}
-
+	
+	
 	if (empty($origin))
 	{
 		if ($socid > 0)
@@ -3009,7 +3013,7 @@ if ($action == 'create')
     				});
     			});
     			</script>';
-				$text = $tmp.$langs->transnoentities("InvoiceAvoirAsk") . ' ';
+				$text = '<label>'.$tmp.$langs->transnoentities("InvoiceAvoirAsk") . '</label> ';
 				// $text.='<input type="text" value="">';
 				$text .= '<select class="flat valignmiddle" name="fac_avoir" id="fac_avoir"';
 				if (! $optionsav)
@@ -3038,7 +3042,7 @@ if ($action == 'create')
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) $tmp='<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 			else $tmp='<input type="radio" name="type" id="radio_creditnote" value="2" > ';
-			$text = $tmp.$langs->trans("InvoiceAvoir") . ' ';
+			$text = '<label>'.$tmp.$langs->trans("InvoiceAvoir") . '</label> ';
 			$text.= '('.$langs->trans("YouMustCreateInvoiceFromThird").') ';
 			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);
 			print $desc;
@@ -3049,7 +3053,7 @@ if ($action == 'create')
 	// Template invoice
 	print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 	$tmp='<input type="radio" name="type" id="radio_template" value="0" disabled> ';
-	$text = $tmp.$langs->trans("RepeatableInvoice") . ' ';
+	$text = '<label>'.$tmp.$langs->trans("RepeatableInvoice") . '</label> ';
 	//$text.= '('.$langs->trans("YouMustCreateStandardInvoiceFirst").') ';
 	$desc = $form->textwithpicto($text, $langs->transnoentities("YouMustCreateStandardInvoiceFirstDesc"), 1, 'help', '', 0, 3);
 	print $desc;
@@ -3057,6 +3061,41 @@ if ($action == 'create')
 
 	print '</div>';
 
+	
+	if(!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
+	{
+    	// Add auto select default document model
+    	$listtType=array(Facture::TYPE_STANDARD,Facture::TYPE_REPLACEMENT,Facture::TYPE_CREDIT_NOTE,Facture::TYPE_DEPOSIT,Facture::TYPE_SITUATION);
+    	$jsListType='';
+    	foreach ($listtType as $type)
+    	{
+    	    $thisTypeConfName = 'FACTURE_ADDON_PDF_'.$type;
+    	    $curent = !empty($conf->global->{$thisTypeConfName})?$conf->global->{$thisTypeConfName}:$conf->global->FACTURE_ADDON_PDF;
+    	    $jsListType.=(!empty($jsListType)?',':'').'"'.$type.'":"'.$curent.'"';
+    	}
+    	
+    	print '<script type="text/javascript" language="javascript">
+        		$(document).ready(function() {
+                    var listType = {'.$jsListType.'};
+        			$("[name=\'type\'").change(function() {
+        				if($( this ).prop("checked"))
+                        {
+                            if(($( this ).val() in listType))
+                            {
+                                $("#model").val(listType[$( this ).val()]);
+                            }
+                            else
+                            {
+                                $("#model").val("'.$conf->global->FACTURE_ADDON_PDF.'");
+                            }
+                        }
+        			});
+        		});
+        		</script>';
+	}
+	
+	
+	
 	print '</td></tr>';
 
 	if ($socid > 0)
@@ -3147,7 +3186,14 @@ if ($action == 'create')
 	print '<td colspan="2">';
 	include_once DOL_DOCUMENT_ROOT . '/core/modules/facture/modules_facture.php';
 	$liste = ModelePDFFactures::liste_modeles($db);
-	print $form->selectarray('model', $liste, $conf->global->FACTURE_ADDON_PDF);
+	if(!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)){ // Hidden conf
+	   $paramkey='FACTURE_ADDON_PDF_'.$object->type;
+	   $curent = !empty($conf->global->$paramkey)?$conf->global->$paramkey:$conf->global->FACTURE_ADDON_PDF;
+	}
+	else{
+	   $curent = $conf->global->FACTURE_ADDON_PDF;
+	}
+	print $form->selectarray('model', $liste, $curent);
 	print "</td></tr>";
 
 	// Multicurrency
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 36863547eb0..e225d1468c4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4107,7 +4107,7 @@ class Facture extends CommonInvoice
 	 *  @param  int			$hidedetails    Hide details of lines
 	 *  @param  int			$hidedesc       Hide description
 	 *  @param  int			$hideref        Hide ref
-	 * @param   null|array  $moreparams     Array to provide more information
+	 *  @param   null|array  $moreparams     Array to provide more information
 	 *	@return int        					<0 if KO, >0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
@@ -4116,12 +4116,15 @@ class Facture extends CommonInvoice
 
 		$langs->load("bills");
 
-		if (! dol_strlen($modele)) {
-
+		if (! dol_strlen($modele))
+		{
 			$modele = 'crabe';
+			$thisTypeConfName = 'FACTURE_ADDON_PDF_'.$this->type;
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
+			} elseif (! empty($conf->global->$thisTypeConfName)) {
+				$modele = $conf->global->$thisTypeConfName;
 			} elseif (! empty($conf->global->FACTURE_ADDON_PDF)) {
 				$modele = $conf->global->FACTURE_ADDON_PDF;
 			}
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 9f680ef4990..7904f485d6a 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -284,8 +284,9 @@ class Utils
 			}
 
 			$errormsg='';
+			$handle = '';
 
-			// Debut appel methode execution
+			// Start call method to execute dump
 			$fullcommandcrypted=$command." ".$paramcrypted." 2>&1";
 			$fullcommandclear=$command." ".$paramclear." 2>&1";
 			if ($compression == 'none') $handle = fopen($outputfile, 'w');
diff --git a/htdocs/core/lib/asset.lib.php b/htdocs/core/lib/asset.lib.php
index 7a4fd80158c..b0a4a6b81a9 100644
--- a/htdocs/core/lib/asset.lib.php
+++ b/htdocs/core/lib/asset.lib.php
@@ -26,7 +26,7 @@
  *
  * @return array head array with tabs
  */
-function AssetsAdminPrepareHead()
+function asset_admin_prepare_head()
 {
 	global $langs, $conf;
 
@@ -70,7 +70,7 @@ function AssetsAdminPrepareHead()
  *
  * @return array head array with tabs
  */
-function AssetsPrepareHead()
+function asset_prepare_head()
 {
 	global $langs, $conf;
 
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 9f848fb68ee..350014b3eb9 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -305,9 +305,9 @@ function redirectToContainer($containerref, $containeraliasalt='',$containerid=0
  */
 function includeContainer($containerref)
 {
-	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $weblangs;	// Very important. Required to have var available when running inluded containers.
+	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs;	// Very important. Required to have var available when running inluded containers.
 	global $includehtmlcontentopened;
-	global $websitekey;
+	global $websitekey, $websitepagefile;
 
 	$MAXLEVEL=20;
 
@@ -607,7 +607,7 @@ function dolSavePageContent($filetpl, $object, $objectpage)
 
 	$tplcontent ='';
 	$tplcontent.= "<?php // BEGIN PHP\n";
-	$tplcontent.= '$websitekey=basename(dirname(__FILE__));'."\n";
+	$tplcontent.= '$websitekey=basename(dirname(__FILE__)); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
 	$tplcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Not already loaded"."\n";
 	$tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
 	$tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
@@ -624,6 +624,7 @@ function dolSavePageContent($filetpl, $object, $objectpage)
 	$tplcontent.= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n";
 	$tplcontent.= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
 	$tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
+	$tplcontent.= '<link href="/'.(($objectpage->id == $object->fk_default_home) ? '' : ($objectpage->pageurl.'.php')).'" rel="canonical" />'."\n";
 	$tplcontent.= '<!-- Include link to CSS file -->'."\n";
 	$tplcontent.= '<link rel="stylesheet" href="styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
 	$tplcontent.= '<!-- Include HTML header from common file -->'."\n";
@@ -672,7 +673,7 @@ function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)
 	dol_delete_file($fileindex);
 	$indexcontent = '<?php'."\n";
 	$indexcontent.= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
-	$indexcontent.= '$websitekey=basename(dirname(__FILE__));'."\n";
+	$indexcontent.= '$websitekey=basename(dirname(__FILE__)); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
 	$indexcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded\n";
 	$indexcontent.= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
 	$indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
diff --git a/htdocs/core/modules/modDataPolicies.class.php b/htdocs/core/modules/modDataPolicy.class.php
similarity index 59%
rename from htdocs/core/modules/modDataPolicies.class.php
rename to htdocs/core/modules/modDataPolicy.class.php
index 74bbe0ba7d2..2ecb5da4336 100644
--- a/htdocs/core/modules/modDataPolicies.class.php
+++ b/htdocs/core/modules/modDataPolicy.class.php
@@ -18,12 +18,12 @@
  */
 
 /**
- * 	\defgroup   datapolicies     Module datapolicies
- *  \brief      datapolicies module descriptor.
+ * 	\defgroup   datapolicy     Module datapolicy
+ *  \brief      datapolicy module descriptor.
  *
- *  \file       htdocs/datapolicies/core/modules/modGdpr.class.php
- *  \ingroup    datapolicies
- *  \brief      Description and activation file for module DATAPOLICIES
+ *  \file       htdocs/datapolicy/core/modules/modDataPolicy.class.php
+ *  \ingroup    datapolicy
+ *  \brief      Description and activation file for module DATAPOLICY
  */
 include_once DOL_DOCUMENT_ROOT . '/core/modules/DolibarrModules.class.php';
 
@@ -33,9 +33,9 @@ include_once DOL_DOCUMENT_ROOT . '/core/modules/DolibarrModules.class.php';
 // so we ignore the Squiz.Classes.ValidClassName.NotCamelCaps rule.
 // @codingStandardsIgnoreStart
 /**
- *  Description and activation class for module datapolicies
+ *  Description and activation class for module datapolicy
  */
-class modDataPolicies extends DolibarrModules {
+class modDataPolicy extends DolibarrModules {
 
     // @codingStandardsIgnoreEnd
     /**
@@ -53,7 +53,7 @@ class modDataPolicies extends DolibarrModules {
         // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
         $this->numero = 4100;
         // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'datapolicies';
+        $this->rights_class = 'datapolicy';
 
         // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
         // It is used to group modules by family in module setup page
@@ -62,16 +62,16 @@ class modDataPolicies extends DolibarrModules {
         $this->module_position = '70';
         // Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
         //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
-        // Module label (no space allowed), used if translation string 'ModuledatapoliciesName' not found (MyModue is name of module).
+        // Module label (no space allowed), used if translation string 'ModuledatapolicyName' not found (MyModue is name of module).
         $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuledatapoliciesDesc' not found (MyModue is name of module).
-        $this->description = "Module to manage Data policies (for compliance with GDPR in Europe or other Data policies rules)";
+        // Module description, used if translation string 'ModuledatapolicyDesc' not found (MyModue is name of module).
+        $this->description = "Module to manage Data policy (for compliance with GDPR in Europe or other Data policy rules)";
         // Used only if file README.md and README-LL.md not found.
         $this->descriptionlong = "";
 
         // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
         $this->version = 'development';
-        // Key used in llx_const table to save module status enabled/disabled (where datapolicies is value of property name of module in uppercase)
+        // Key used in llx_const table to save module status enabled/disabled (where datapolicy is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
         // Name of image file used for this module.
         // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
@@ -79,9 +79,9 @@ class modDataPolicies extends DolibarrModules {
         $this->picto = 'generic';
 
         // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-        // for default path (eg: /datapolicies/core/xxxxx) (0=disable, 1=enable)
-        // for specific path of parts (eg: /datapolicies/core/modules/barcode)
-        // for specific css file (eg: /datapolicies/css/datapolicies.css.php)
+        // for default path (eg: /datapolicy/core/xxxxx) (0=disable, 1=enable)
+        // for specific path of parts (eg: /datapolicy/core/modules/barcode)
+        // for specific css file (eg: /datapolicy/css/datapolicy.css.php)
         $this->module_parts = array(
             'triggers' => 0, // Set this to 1 if module has its own trigger directory (core/triggers)
             'login' => 0, // Set this to 1 if module has its own login method file (core/login)
@@ -95,41 +95,41 @@ class modDataPolicies extends DolibarrModules {
         );
 
         // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/datapolicies/temp","/datapolicies/subdir");
-        $this->dirs = array("/datapolicies/temp");
+        // Example: this->dirs = array("/datapolicy/temp","/datapolicy/subdir");
+        $this->dirs = array("/datapolicy/temp");
 
-        // Config pages. Put here list of php page, stored into datapolicies/admin directory, to use to setup module.
-        $this->config_page_url = array("setup.php@datapolicies");
+        // Config pages. Put here list of php page, stored into datapolicy/admin directory, to use to setup module.
+        $this->config_page_url = array("setup.php@datapolicy");
 
         // Dependencies
         $this->hidden = false;   // A condition to hide module
         $this->depends = array();  // List of module class names as string that must be enabled if this module is enabled
         $this->requiredby = array(); // List of module ids to disable if this one is disabled
         $this->conflictwith = array(); // List of module class names as string this module is in conflict with
-        $this->langfiles = array("datapolicies@datapolicies");
+        $this->langfiles = array("datapolicy@datapolicy");
         $this->phpmin = array(5, 3);     // Minimum version of PHP required by module
         $this->need_dolibarr_version = array(4, 0); // Minimum version of Dolibarr required by module
         $this->warnings_activation = array();                     // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
         $this->warnings_activation_ext = array();                 // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        //$this->automatic_activation = array('FR'=>'datapoliciesWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+        //$this->automatic_activation = array('FR'=>'datapolicyWasAutomaticallyActivatedBecauseOfYourCountryChoice');
         //$this->always_enabled = true;								// If true, can't be disabled
         // Constants
         // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(0=>array('datapolicies_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-        //                             1=>array('datapolicies_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+        // Example: $this->const=array(0=>array('datapolicy_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+        //                             1=>array('datapolicy_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
         // );
         $this->const = array(
-            array('DATAPOLICIES_TIERS_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICIES_TIERS_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICIES_TIERS_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICIES_TIERS_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICIES_CONTACT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICIES_CONTACT_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICIES_CONTACT_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICIES_CONTACT_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICIES_CONTACT_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICIES_ADHERENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+            array('DATAPOLICY_TIERS_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+            array('DATAPOLICY_TIERS_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+            array('DATAPOLICY_TIERS_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+            array('DATAPOLICY_TIERS_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+            array('DATAPOLICY_TIERS_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+            array('DATAPOLICY_CONTACT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+            array('DATAPOLICY_CONTACT_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+            array('DATAPOLICY_CONTACT_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+            array('DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+            array('DATAPOLICY_CONTACT_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+            array('DATAPOLICY_ADHERENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
         );
 
         $country = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
@@ -140,17 +140,17 @@ class modDataPolicies extends DolibarrModules {
           'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
           ) */
 
-        if (!isset($conf->datapolicies) || !isset($conf->datapolicies->enabled)) {
-            $conf->datapolicies = new stdClass();
-            $conf->datapolicies->enabled = 0;
+        if (!isset($conf->datapolicy) || !isset($conf->datapolicy->enabled)) {
+            $conf->datapolicy = new stdClass();
+            $conf->datapolicy->enabled = 0;
         }
 
 
         // Array to add new pages in new tabs
         $this->tabs = array();
         // Example:
-        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@datapolicies:$user->rights->datapolicies->read:/datapolicies/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@datapolicies:$user->rights->othermodule->read:/datapolicies/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@datapolicy:$user->rights->datapolicy->read:/datapolicy/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@datapolicy:$user->rights->othermodule->read:/datapolicy/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
         // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
         //
         // Where objecttype can be
@@ -177,7 +177,7 @@ class modDataPolicies extends DolibarrModules {
         $this->dictionaries = array();
         /* Example:
           $this->dictionaries=array(
-          'langs'=>'mylangfile@datapolicies',
+          'langs'=>'mylangfile@datapolicy',
           'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
           'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
           'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
@@ -186,21 +186,21 @@ class modDataPolicies extends DolibarrModules {
           'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
           'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
           'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-          'tabcond'=>array($conf->datapolicies->enabled,$conf->datapolicies->enabled,$conf->datapolicies->enabled)												// Condition to show each dictionary
+          'tabcond'=>array($conf->datapolicy->enabled,$conf->datapolicy->enabled,$conf->datapolicy->enabled)												// Condition to show each dictionary
           );
          */
 
 
         // Boxes/Widgets
-        // Add here list of php file(s) stored in datapolicies/core/boxes that contains class to show a widget.
+        // Add here list of php file(s) stored in datapolicy/core/boxes that contains class to show a widget.
         $this->boxes = array();
 
 
         // Cronjobs (List of cron jobs entries to add when module is enabled)
         // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
         $this->cronjobs = array(
-            0 => array('label' => 'DATAPOLICIES Cron', 'jobtype' => 'method', 'class' => '/datapolicies/class/datapoliciesCron.class.php', 'objectname' => 'RgpdCron', 'method' => 'exec', 'parameters' => '', 'comment' => 'Comment', 'frequency' => 1, 'unitfrequency' => 86400, 'status' => 1, 'test' => true),
-            1 => array('label' => 'DATAPOLICIES Mailing', 'jobtype' => 'method', 'class' => '/datapolicies/class/datapoliciesCron.class.php', 'objectname' => 'RgpdCron', 'method' => 'sendMailing', 'parameters' => '', 'comment' => 'Comment', 'frequency' => 1, 'unitfrequency' => 86400, 'status' => 0, 'test' => true)
+            0 => array('label' => 'DATAPOLICY Cron', 'jobtype' => 'method', 'class' => '/datapolicy/class/datapolicyCron.class.php', 'objectname' => 'RgpdCron', 'method' => 'exec', 'parameters' => '', 'comment' => 'Comment', 'frequency' => 1, 'unitfrequency' => 86400, 'status' => 1, 'test' => true),
+            1 => array('label' => 'DATAPOLICY Mailing', 'jobtype' => 'method', 'class' => '/datapolicy/class/datapolicyCron.class.php', 'objectname' => 'RgpdCron', 'method' => 'sendMailing', 'parameters' => '', 'comment' => 'Comment', 'frequency' => 1, 'unitfrequency' => 86400, 'status' => 0, 'test' => true)
         );
         // Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true),
         //                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>true)
@@ -224,7 +224,7 @@ class modDataPolicies extends DolibarrModules {
     {
     	global $langs;
 
-    	$this->_load_tables('/datapolicies/sql/');
+    	$this->_load_tables('/datapolicy/sql/');
 
         // Create extrafields
         include_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
@@ -232,28 +232,28 @@ class modDataPolicies extends DolibarrModules {
 
 
         // Extrafield contact
-        //$result1=$extrafields->addExtraField('datapolicies_separate', "DATAPOLICIES_BLOCKCHECKBOX", 'separate', 100,  1, 'thirdparty',   0, 0, '', '', 1, '', '1', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_consentement', $langs->trans("DATAPOLICIES_consentement"), 'boolean', 101, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_opposition_traitement', $langs->trans("DATAPOLICIES_opposition_traitement"), 'boolean', 102, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_opposition_prospection', $langs->trans("DATAPOLICIES_opposition_prospection"), 'boolean', 103, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_date', $langs->trans("DATAPOLICIES_date"), 'date', 104, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0);
-        $result1 = $extrafields->addExtraField('datapolicies_send', $langs->trans("DATAPOLICIES_send"), 'date', 105, 3, 'thirdparty', 0, 0, '', '', 0, '', '0', 0);
+        //$result1=$extrafields->addExtraField('datapolicy_separate', "DATAPOLICY_BLOCKCHECKBOX", 'separate', 100,  1, 'thirdparty',   0, 0, '', '', 1, '', '1', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0);
+        $result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'thirdparty', 0, 0, '', '', 0, '', '0', 0);
 
         // Extrafield Tiers
-        //$result1=$extrafields->addExtraField('datapolicies_separate', "DATAPOLICIES_BLOCKCHECKBOX", 'separate', 100,  1, 'contact',   0, 0, '', '', 1, '', '1', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_consentement', $langs->trans("DATAPOLICIES_consentement"), 'boolean', 101, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_opposition_traitement', $langs->trans("DATAPOLICIES_opposition_traitement"), 'boolean', 102, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_opposition_prospection', $langs->trans("DATAPOLICIES_opposition_prospection"), 'boolean', 103, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_date', $langs->trans("DATAPOLICIES_date"), 'date', 104, 3, 'contact', 0, 0, '', '', 1, '', '3', 0);
-        $result1 = $extrafields->addExtraField('datapolicies_send', $langs->trans("DATAPOLICIES_send"), 'date', 105, 3, 'contact', 0, 0, '', '', 0, '', '0', 0);
+        //$result1=$extrafields->addExtraField('datapolicy_separate', "DATAPOLICY_BLOCKCHECKBOX", 'separate', 100,  1, 'contact',   0, 0, '', '', 1, '', '1', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'contact', 0, 0, '', '', 1, '', '3', 0);
+        $result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'contact', 0, 0, '', '', 0, '', '0', 0);
 
         // Extrafield Adherent
-        //$result1=$extrafields->addExtraField('datapolicies_separate', "DATAPOLICIES_BLOCKCHECKBOX", 'separate', 100,  1, 'adherent',   0, 0, '', '', 1, '', '1', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_consentement', $langs->trans("DATAPOLICIES_consentement"), 'boolean', 101, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_opposition_traitement', $langs->trans("DATAPOLICIES_opposition_traitement"), 'boolean', 102, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_opposition_prospection', $langs->trans("DATAPOLICIES_opposition_prospection"), 'boolean', 103, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicies@datapolicies', '$conf->datapolicies->enabled');
-        $result1 = $extrafields->addExtraField('datapolicies_date', $langs->trans("DATAPOLICIES_date"), 'date', 104, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0);
-        $result1 = $extrafields->addExtraField('datapolicies_send', $langs->trans("DATAPOLICIES_send"), 'date', 105, 3, 'adherent', 0, 0, '', '', 0, '', '0', 0);
+        //$result1=$extrafields->addExtraField('datapolicy_separate', "DATAPOLICY_BLOCKCHECKBOX", 'separate', 100,  1, 'adherent',   0, 0, '', '', 1, '', '1', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+        $result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0);
+        $result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'adherent', 0, 0, '', '', 0, '', '0', 0);
 
         $sql = array();
 
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 99ae9a699a1..cc361be5e60 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -199,12 +199,12 @@ if ($permission) {
 			if ($tab[$i]['source']=='internal')
 			{
 				$userstatic->fetch($tab[$i]['id']);
-				echo $userstatic->getNomUrl(-1);
+				echo $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
 			}
 			if ($tab[$i]['source']=='external')
 			{
 				$contactstatic->fetch($tab[$i]['id']);
-				echo $contactstatic->getNomUrl(1);
+				echo $contactstatic->getNomUrl(1, '', 0, 0, 0, 0, '', 'valignmiddle');
 			}
 			?>
 		</div>
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 0e1942c1c64..101c9ec7e67 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -184,7 +184,7 @@ if (! empty($morelogincontent)) {
 </form>
 
 
-<div class="center login_main_home paddingtopbottom<?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' backgroundsemitransparent'; ?>" style="max-width: 70%">
+<div class="center login_main_home divpasswordmessagedesc paddingtopbottom<?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' backgroundsemitransparent'; ?>" style="max-width: 70%">
 <?php if ($mode == 'dolibarr' || ! $disabled) { ?>
 	<span class="passwordmessagedesc">
 	<?php echo $langs->trans('SendNewPasswordDesc'); ?>
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index ac4d6b35988..1338104de0b 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -19,21 +19,75 @@
 /**
  *	\file			htdocs/core/website.inc.php
  *  \brief			Common file loaded by all website pages (after master.inc.php). It set the new object $weblangs, using parameter 'l'.
+ *  				This file is included in top of all container pages.
  *  			    The global variable $websitekey must be defined.
  */
 
 // Load website class
 include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
-// Define $website and $weblangs
+// Define $website
 if (! is_object($website))
 {
 	$website=new Website($db);
 	$website->fetch(0,$websitekey);
 }
+// Define $weblangs
 if (! is_object($weblangs))
 {
-	$weblangs = dol_clone($langs);
+	$weblangs = dol_clone($langs);	// TODO Use an object lang from a language set into $website object instead of backoffice
 }
+// Define $websitepage if we have $websitepagefile defined
+if (! $pageid && ! empty($websitepagefile))
+{
+	$pageid = str_replace(array('.tpl.php', 'page'), array('', ''), basename($websitepagefile));
+}
+if ($pageid > 0)
+{
+	include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+	$websitepage=new WebsitePage($db);
+	$websitepage->fetch($pageid);
+}
+
+// A lang was forced, so we change weblangs init
 if (GETPOST('l','aZ09')) $weblangs->setDefaultLang(GETPOST('l','aZ09'));
+// A lang was forced, so we check to find if we must make a redirect on translation page
+if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php')	// If we browsing page using Dolibarr server or a Native web server
+{
+	//print_r(get_defined_constants(true));exit;
+	if (GETPOST('l','aZ09'))
+	{
+		$sql ="SELECT wp.rowid, wp.lang, wp.pageurl, wp.fk_page";
+		$sql.=" FROM ".MAIN_DB_PREFIX."website_page as wp";
+		$sql.=" WHERE wp.fk_website = ".$website->id;
+		$sql.=" AND (wp.fk_page = ".$pageid." OR wp.rowid  = ".$pageid;
+		if (is_object($websitepage) && $websitepage->fk_page > 0) $sql.=" OR wp.fk_page = ".$websitepage->fk_page." OR wp.rowid = ".$websitepage->fk_page;
+		$sql.=")";
+		$sql.= " AND wp.lang = '".$db->escape(GETPOST('l','aZ09'))."'";
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj)
+			{
+				$newpageid = $obj->rowid;
+				if ($newpageid != $pageid) 		// To avoid to make a redirect on same page (infinite loop)
+				{
+					if (defined('USEDOLIBARRSERVER')) {
+						header("Location: ".DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$newpageid.'&l='.GETPOST('l','aZ09'));
+						exit;
+					}
+					else
+					{
+						$newpageref = $obj->pageurl;
+						header("Location: ".$newpageref.'.php?l='.GETPOST('l','aZ09'));
+						exit;
+					}
+				}
+			}
+		}
+	}
+}
+
 // Load websitepage class
 include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
diff --git a/htdocs/datapolicies/langs/en_US/datapolicies.lang b/htdocs/datapolicies/langs/en_US/datapolicies.lang
deleted file mode 100644
index 164581bcca5..00000000000
--- a/htdocs/datapolicies/langs/en_US/datapolicies.lang
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (C) 2018 Nicolas ZABOURI    <info@inovea-conseil.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Module label 'ModulergpdName'
-ModulergpdName = GDPR
-# Module description 'ModulergpdDesc'
-ModulergpdDesc = Conformity with the GDPR
-
-#
-# Page d'administration
-#
-rgpdSetup = Module Setup
-Settings_DATAPOLICIES = Settings of DATAPOLICIES module
-rgpdSetupPage = According to <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank">Article 5</a> of the GDPR, personal data must be kept for a period not exceeding that necessary for the purposes for which they were processed, except for archival purposes.
-The deletion will be done automatically after a certain duration without event (the duration which you will have indicated below).
-NB_MONTHS = %s months
-ONE_YEAR = 1 year
-NB_YEARS = %s years
-DATAPOLICIES_TIERS_CLIENT = Customer
-DATAPOLICIES_TIERS_PROSPECT = Prospect
-DATAPOLICIES_TIERS_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
-DATAPOLICIES_TIERS_FOURNISSEUR = Supplier
-DATAPOLICIES_CONTACT_CLIENT = Customer
-DATAPOLICIES_CONTACT_PROSPECT = Prospect
-DATAPOLICIES_CONTACT_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICIES_CONTACT_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
-DATAPOLICIES_CONTACT_FOURNISSEUR = Supplier
-DATAPOLICIES_ADHERENT = Member
-DATAPOLICIES_Tooltip_SETUP = Type of contact - Indicate your choices for each type.
-DATAPOLICIESMail=Emails Setup
-DATAPOLICIESSUBJECTMAIL=Subject of email
-DATAPOLICIESCONTENTMAIL=Content of the email
-DATAPOLICIESSUBSITUTION=You can use the following variables in your email (LINKACCEPT allows to create a link recording the agreement of the person, LINKREFUSED makes it possible to record the refusal of the person):
-DATAPOLICIESACCEPT=Message after agreement
-DATAPOLICIESREFUSE=Message after desagreement
-SendAgreementText=You can send a GDPR email to all your relevant contacts (who have not yet received an email and for which you have not registered anything about their GDPR agreement). To do this, use the following button.
-SendAgreement=Send emails
-AllAgreementSend = All emails have been sent
-TXTLINKDATAPOLICIESACCEPT= Text for the link "agreement" 
-TXTLINKDATAPOLICIESREFUSE= Text for the link "desagreement" 
-
-
-#
-# Extrafield
-#
-DATAPOLICIES_BLOCKCHECKBOX = GDPR : Processing of personal data
-DATAPOLICIES_consentement = Consent obtained for the processing of personal data 
-DATAPOLICIES_opposition_traitement = Opposes the processing of his personal data
-DATAPOLICIES_opposition_prospection = Opposes the processing of his personal data for the purposes of prospecting
-
-#
-# Popup
-#
-DATAPOLICIES_POPUP_ANONYME_TITLE = Anonymize a thirdparty
-DATAPOLICIES_POPUP_ANONYME_TEXTE = You can not delete this contact from Dolibarr because there are related items. In accordance with the GDPR, you will make all this data anonymous to respect your obligations. Would you like to continue ?
-
-#
-# Bouton portabilité
-# 
-DATAPOLICIES_PORTABILITE = Portability GDPR
-DATAPOLICIES_PORTABILITE_TITLE = Export of personal data
-DATAPOLICIES_PORTABILITE_CONFIRMATION = You want to export the personal data of this contact. Are you sure ?
-
-#
-# Note ajoutés lors d'une anonymisation
-#
-ANONYMISER_AT = Anonymised the %s
-
-#V2
-DATAPOLICIESReturn=GDPR Validation
-DATAPOLICIES_date = Date of agreement/desagreement GDPR
-DATAPOLICIES_send = Date sending agreement email
-DATAPOLICIESReturn = GDPR Return
-DATAPOLICIES_SEND = Send GDPR email
-MailSent = Email has been sent
-
-#ERROR
-ErrorSubjectIsRequired= Error : The subject of email is required. Indicate it in the module setup
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to send us your choice.
-NUMBER_MONTH_BEFORE_DELETION = Number of month before deletion
diff --git a/htdocs/datapolicies/langs/fr_FR/datapolicies.lang b/htdocs/datapolicies/langs/fr_FR/datapolicies.lang
deleted file mode 100644
index 916cdffb776..00000000000
--- a/htdocs/datapolicies/langs/fr_FR/datapolicies.lang
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright (C) 2018  INOVEA CONSEil info@inovea-conseil.com
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#
-# Générique
-#
-
-# Module label 'ModulergpdName'
-ModulergpdName = DATAPOLICIES
-# Module description 'ModulergpdDesc'
-Module432452Desc = Module de mise en conformité avec le DATAPOLICIES
-
-#
-# Page d'administration
-#
-rgpdSetup = Configuration du module DATAPOLICIES
-Settings_DATAPOLICIES = Paramétrage du module DATAPOLICIES
-rgpdSetupPage = Selon <a href="http://www.privacy-regulation.eu/fr/5.htm" target="_blank">l’article 5</a> du DATAPOLICIES, les données à caractère personnel doivent être conservées pendant une durée n’excédant pas celle nécessaire au regard des finalités pour lesquelles elles ont été traitées, à l’exception de fins archivistiques. La suppression se fera automatiquement après une certaine durée sans évènement (la durée que vous aurez indiquée ci-dessous).
-NB_MONTHS = %s mois
-ONE_YEAR = 1 an
-NB_YEARS = %s ans
-DATAPOLICIES_TIERS_CLIENT = Client
-DATAPOLICIES_TIERS_PROSPECT = Prospect
-DATAPOLICIES_TIERS_PROSPECT_CLIENT = Prospect/Client
-DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT = Ni prospect / Ni client
-DATAPOLICIES_TIERS_FOURNISSEUR = Fournisseur
-DATAPOLICIES_CONTACT_CLIENT = Client
-DATAPOLICIES_CONTACT_PROSPECT = Prospect
-DATAPOLICIES_CONTACT_PROSPECT_CLIENT = Prospect/Client
-DATAPOLICIES_CONTACT_NIPROSPECT_NICLIENT = Ni prospect / Ni client
-DATAPOLICIES_CONTACT_FOURNISSEUR = Fournisseur
-DATAPOLICIES_ADHERENT = Adhérent
-DATAPOLICIES_Tooltip_SETUP = Type du contact - Indiquez vos choix pour chaque type.
-DATAPOLICIESMail=Paramétrage des emails
-DATAPOLICIESSUBJECTMAIL=Objet du mail
-DATAPOLICIESCONTENTMAIL=Contenu du mail
-DATAPOLICIESSUBSITUTION=Vous pouvez utiliser les variables suivantes dans votre email (LINKACCEPT permet de créer un lien enregistrant l'acceptation de la personne, LINKREFUSED permet d'enregistrer le refus de la personne) :
-DATAPOLICIESACCEPT=Message suite acceptation
-DATAPOLICIESREFUSE=Message suite opposition
-SendAgreementText=Vous pouvez envoyer un email DATAPOLICIES à tous vos contacts concernés (qui n'ont pas encore reçus de mail et pour lesquels vous n'avez rien enregistré concernant leur accord/désaccord DATAPOLICIES). Pour cela, utilisez le bouton suivant.
-SendAgreement=Envoyer les emails
-AllAgreementSend = Tous les e-mails de consentement ont été envoyés
-TXTLINKDATAPOLICIESACCEPT= Texte du lien d'acceptation
-TXTLINKDATAPOLICIESREFUSE= Texte du lien d'opposition
-
-
-
-#
-# Extrafield
-#
-DATAPOLICIES_BLOCKCHECKBOX = DATAPOLICIES : Traitement des données à caractère personnel
-DATAPOLICIES_consentement = Consentement recueilli pour le traitement des données à caractère personnel le concernant
-DATAPOLICIES_opposition_traitement = S’oppose au traitement de ses données à caractère personnel
-DATAPOLICIES_opposition_prospection = S’oppose au traitement de ses données à caractère personnel à des fins de prospection
-
-#
-# Popup
-#
-DATAPOLICIES_POPUP_ANONYME_TITLE = Anonymiser un tiers
-DATAPOLICIES_POPUP_ANONYME_TEXTE = Vous ne pouvez pas supprimer ce contact de Dolibarr car des éléments y sont liés. Conformément au DATAPOLICIES, vous allez rendre toutes ces données anonymes afin de respecter vos obligations. Souhaitez-vous continuer ?
-
-#
-# Bouton portabilité
-# 
-DATAPOLICIES_PORTABILITE = Portabilité DATAPOLICIES
-DATAPOLICIES_PORTABILITE_TITLE = Export des données à caractère personnel
-DATAPOLICIES_PORTABILITE_CONFIRMATION = Vous souhaitez exporter les données à caractère personnel de ce contact. Etes-vous sûr ?
-
-#
-# Note ajoutés lors d'une anonymisation
-#
-ANONYMISER_AT = Anonymisé le %s
-
-#V2
-DATAPOLICIESReturn=Validation DATAPOLICIES
-DATAPOLICIES_date=Date d'accord/opposition au traitement
-DATAPOLICIES_send=Date envoi consentement
-DATAPOLICIESReturn=Retour DATAPOLICIES
-DATAPOLICIES_SEND=Envoyer l'email de consentement
-MailSent=L'email a bien été envoyé
-
-#ERROR
-ErrorSubjectIsRequired=Erreur : vous n'avez pas indiqué l'objet de l'email dans la configuration
-=Suite à un problème technique, nous n'avons pas pu enregistrer votre choix. Nous nous en excusons. Contactez-nous pour nous transmettre votre choix.
-NUMBER_MONTH_BEFORE_DELETION = Nombre de mois avant suppression des données
diff --git a/htdocs/datapolicies/langs/it_IT/datapolicies.lang b/htdocs/datapolicies/langs/it_IT/datapolicies.lang
deleted file mode 100644
index a979c931c41..00000000000
--- a/htdocs/datapolicies/langs/it_IT/datapolicies.lang
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (C) 2018 INOVEA CONSEIl info@inovea-conseil.com - Thanks to Claudio Aschieri
-#
-# # Module label 'ModulergpdName'
-ModulergpdName = GDPR
-# Module description 'ModulergpdDesc'
-ModulergpdDesc = Conformità con GDPR
-Module432452Name=GDPR
-Module432452Desc=Conformità con GDPR (Regolamento Generale sulla protezione di dati)
-
-#
-# Page d'administration
-#
-rgpdSetup = Module Setup
-Settings_DATAPOLICIES = Configurazione modulo GDPR 
-rgpdSetupPage = In accordo con <a href="http://www.privacy-regulation.eu/it/5.htm" target="_blank">l'art 5 del GDPR </a> i dati personali devono essere conservati per un periodo di tempo che .... ed eliminati se non sono più utili agli scopi per cui sono stati processati.
-NB_MONTHS = %s mesi
-ONE_YEAR = 1 anno
-NB_YEARS = %s anni
-DATAPOLICIES_TIERS_CLIENT = Cliente
-DATAPOLICIES_TIERS_PROSPECT = Fornitore
-DATAPOLICIES_TIERS_PROSPECT_CLIENT = Potenziale Cliente / Cliente
-DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT = Nè potenziale cliente / Nè cliente
-DATAPOLICIES_TIERS_FOURNISSEUR = Fornitore
-DATAPOLICIES_CONTACT_CLIENT = Cliente
-DATAPOLICIES_CONTACT_PROSPECT = Potenziale cliente
-DATAPOLICIES_CONTACT_PROSPECT_CLIENT = Potenziale Cliente / Cliente
-DATAPOLICIES_CONTACT_NIPROSPECT_NICLIENT = Nè potenziale cliente / Nè cliente
-DATAPOLICIES_CONTACT_FOURNISSEUR = Fornitore
-DATAPOLICIES_ADHERENT = Membri
-DATAPOLICIES_Tooltip_SETUP = Tipo di contatto - Indica la scelta per ogni tipologia
-DATAPOLICIESMail=Configurazione Email
-DATAPOLICIESSUBJECTMAIL=Subject dell'e-mail
-DATAPOLICIESCONTENTMAIL=Contenuto dell'e-mail
-DATAPOLICIESSUBSITUTION=Puoi utilizzare le seguenti variabili nella tua email (LINKACCEPT consente di creare un link per registrare l'accettazione della persona, LINKREFUSED consente di registrare il rifiuto della persona):
-DATAPOLICIESACCEPT= Messaggio dopo il consenso
-DATAPOLICIESREFUSE=Messaggio dopo il rifiuto
-SendAgreementText=Puoi inviare un'email GDPR a tutti i tuoi contatti rilevanti (che non hanno ancora ricevuto un'e-mail e per i quali non hai registrato nulla sul loro accordo GDPR). Per fare ciò, utilizzare il seguente pulsante.
-SendAgreement=Invia emails
-AllAgreementSend = Tutte le email sono state inviate
-TXTLINKDATAPOLICIESACCEPT= Testo per il link "Consenso" 
-TXTLINKDATAPOLICIESREFUSE= Testo per il link "Consenso negato" 
-
-#
-# Extrafield
-#
-DATAPOLICIES_BLOCKCHECKBOX = GDPR : Trattamento dei dati personali
-DATAPOLICIES_consentement = Consenso ottenuto al Trattamento dei dati personali
-DATAPOLICIES_opposition_traitement = Consenso negato al trattamento dei dati personali
-DATAPOLICIES_opposition_prospection = Consenso negato al trattamento dei dati personali a fini commerciali
-
-#
-# Popup
-#
-DATAPOLICIES_POPUP_ANONYME_TITLE = Anonimizza un soggetto terzo
-DATAPOLICIES_POPUP_ANONYME_TEXTE = Impossibile eliminare questo contatto da Dolibarr perchè vi sono elementi collegati. In conformità con il GDPR, renderai tutti questi dati anonimi per rispettare i tuoi obblighi. Vuoi continuare?
-
-
-#
-# Bouton portabilité
-# 
-DATAPOLICIES_PORTABILITE = Portabilità GDPR
-DATAPOLICIES_PORTABILITE_TITLE = Esporta i dati personali
-DATAPOLICIES_PORTABILITE_CONFIRMATION = Vuoi davvero esportare i dati personali di questo contatto?
-
-#
-# Note ajoutée lors d'une anonymisation
-#
-ANONYMISER_AT = Anonimizzato il %s
-
-#V2
-DATAPOLICIESReturn=GDPR Validazione
-DATAPOLICIES_date = Data di accordo / disaccordo GDPR
-DATAPOLICIES_send = Data di invio del consenso (e-mail)
-DATAPOLICIESReturn = GDPR ritorno
-DATAPOLICIES_SEND = Inviare GDPR e-mail
-MailSent=L'email è stata inviata
-
-#ERROR
-ErrorSubjectIsRequired= Errore: L'oggetto della mail è obbligatorio. Inserisci l'oggetto nella configurazione del modulo.
-=A causa di un problema tecnico, non siamo stati in grado di registrare la tua scelta. Ci scusiamo per questo. Contattaci per inviarci la tua scelta.
diff --git a/htdocs/datapolicies/ChangeLog.md b/htdocs/datapolicy/ChangeLog.md
similarity index 100%
rename from htdocs/datapolicies/ChangeLog.md
rename to htdocs/datapolicy/ChangeLog.md
diff --git a/htdocs/datapolicies/admin/setup.php b/htdocs/datapolicy/admin/setup.php
similarity index 71%
rename from htdocs/datapolicies/admin/setup.php
rename to htdocs/datapolicy/admin/setup.php
index f6edd5b3e90..777fa6cb893 100644
--- a/htdocs/datapolicies/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -17,21 +17,21 @@
  */
 
 /**
- * \file    datapolicies/admin/setup.php
- * \ingroup datapolicies
- * \brief   datapolicies setup page.
+ * \file    datapolicy/admin/setup.php
+ * \ingroup datapolicy
+ * \brief   datapolicy setup page.
  */
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once '../lib/datapolicies.lib.php';
+require_once '../lib/datapolicy.lib.php';
 //require_once "../class/myclass.class.php";
 
 // Translations
 $langs->load('admin');
 $langs->load('companies');
 $langs->load('members');
-$langs->load('datapolicies@datapolicies');
+$langs->load('datapolicy@datapolicy');
 
 // Access control
 if (! $user->admin) accessforbidden();
@@ -41,17 +41,17 @@ $action = GETPOST('action', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters=array(
-    'DATAPOLICIES_TIERS_CLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICIES_TIERS_PROSPECT'=>array('css'=>'minwidth200'),
-    'DATAPOLICIES_TIERS_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICIES_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200'),
-    'DATAPOLICIES_CONTACT_CLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICIES_CONTACT_PROSPECT'=>array('css'=>'minwidth200'),
-    'DATAPOLICIES_CONTACT_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICIES_CONTACT_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICIES_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200'),
-    'DATAPOLICIES_ADHERENT'=>array('css'=>'minwidth200'),
+    'DATAPOLICY_TIERS_CLIENT'=>array('css'=>'minwidth200'),
+    'DATAPOLICY_TIERS_PROSPECT'=>array('css'=>'minwidth200'),
+    'DATAPOLICY_TIERS_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
+    'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
+    'DATAPOLICY_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200'),
+    'DATAPOLICY_CONTACT_CLIENT'=>array('css'=>'minwidth200'),
+    'DATAPOLICY_CONTACT_PROSPECT'=>array('css'=>'minwidth200'),
+    'DATAPOLICY_CONTACT_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
+    'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
+    'DATAPOLICY_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200'),
+    'DATAPOLICY_ADHERENT'=>array('css'=>'minwidth200'),
 );
 
 
@@ -81,26 +81,26 @@ if (DOL_VERSION < '7' && $action == 'update') {
 
 $arrayofparameters=array(
     'ThirdParty' => array(
-        'DATAPOLICIES_TIERS_CLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICIES_TIERS_PROSPECT'=>array('css'=>'minwidth200'),
-        'DATAPOLICIES_TIERS_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICIES_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200'),
+        'DATAPOLICY_TIERS_CLIENT'=>array('css'=>'minwidth200'),
+        'DATAPOLICY_TIERS_PROSPECT'=>array('css'=>'minwidth200'),
+        'DATAPOLICY_TIERS_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
+        'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
+        'DATAPOLICY_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200'),
     ),
     'Contact' => array(
-        'DATAPOLICIES_CONTACT_CLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICIES_CONTACT_PROSPECT'=>array('css'=>'minwidth200'),
-        'DATAPOLICIES_CONTACT_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICIES_CONTACT_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICIES_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200'),
+        'DATAPOLICY_CONTACT_CLIENT'=>array('css'=>'minwidth200'),
+        'DATAPOLICY_CONTACT_PROSPECT'=>array('css'=>'minwidth200'),
+        'DATAPOLICY_CONTACT_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
+        'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
+        'DATAPOLICY_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200'),
     ),
     'Member' => array(
-        'DATAPOLICIES_ADHERENT'=>array('css'=>'minwidth200'),
+        'DATAPOLICY_ADHERENT'=>array('css'=>'minwidth200'),
     )
 );
 
 $valTab = array(
-    '' => $langs->trans('None'),
+    '' => $langs->trans('Never'),
     '6' => $langs->trans('NB_MONTHS', 6),
     '12' => $langs->trans('ONE_YEAR'),
     '24' => $langs->trans('NB_YEARS', 2),
@@ -108,6 +108,8 @@ $valTab = array(
     '48' => $langs->trans('NB_YEARS', 4),
     '60' => $langs->trans('NB_YEARS', 5),
     '120' => $langs->trans('NB_YEARS', 10),
+	'180' => $langs->trans('NB_YEARS', 15),
+	'240' => $langs->trans('NB_YEARS', 20),
 );
 
 
@@ -115,20 +117,20 @@ $valTab = array(
  * View
  */
 
-$page_name = "datapoliciesSetup";
+$page_name = "datapolicySetup";
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
 $linkback = '<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_datapolicies@datapolicies');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'object_datapolicy@datapolicy');
 
 // Configuration header
-$head = datapoliciesAdminPrepareHead();
-dol_fiche_head($head, 'settings', '', -1, "datapolicies@datapolicies");
+$head = datapolicyAdminPrepareHead();
+dol_fiche_head($head, 'settings', '', -1, "datapolicy@datapolicy");
 
 // Setup page goes here
-echo $langs->trans("datapoliciesSetupPage");
+echo '<span class="opacitymedium">'.$langs->trans("datapolicySetupPage").'</span><br><br>';
 
 
 if ($action == 'edit')
@@ -180,7 +182,7 @@ else
         foreach($tab as $key => $val)
         {
             print '<tr class="oddeven"><td>';
-            print $form->textwithpicto($langs->trans($key),$langs->trans('DATAPOLICIES_Tooltip_SETUP'));
+            print $form->textwithpicto($langs->trans($key),$langs->trans('DATAPOLICY_Tooltip_SETUP'));
             print '</td><td>' . ($conf->global->$key == '' ? $langs->trans('None') : $valTab[$conf->global->$key]) . '</td></tr>';
         }
 
diff --git a/htdocs/datapolicies/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
similarity index 94%
rename from htdocs/datapolicies/admin/setupmail.php
rename to htdocs/datapolicy/admin/setupmail.php
index a6560c1f7d5..214f673a15f 100644
--- a/htdocs/datapolicies/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -22,10 +22,10 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';
-require_once '../lib/datapolicies.lib.php';
+require_once '../lib/datapolicy.lib.php';
 
 // Translations
-$langs->loadLangs(array('admin', 'companies', 'members', 'datapolicies'));
+$langs->loadLangs(array('admin', 'companies', 'members', 'datapolicy'));
 
 
 // Parameters
@@ -78,17 +78,17 @@ if ($action == 'setvalue' && $user->admin) {
  * View
  */
 
-$page_name = "datapoliciesSetup";
+$page_name = "datapolicySetup";
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
 $linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
 
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_datapolicies@datapolicies');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'object_datapolicy@datapolicy');
 
 // Configuration header
-$head = datapoliciesAdminPrepareHead();
-dol_fiche_head($head, 'settings', '', -1, "datapolicies@datapolicies");
+$head = datapolicyAdminPrepareHead();
+dol_fiche_head($head, 'settings', '', -1, "datapolicy@datapolicy");
 
 
 
@@ -161,7 +161,7 @@ dol_fiche_end();
 print '<br><br>';
 
 print $langs->trans('SendAgreementText');
-print '<a class="button" href="'.dol_buildpath('/datapolicies/mailing.php').'">'.$langs->trans('SendAgreement').'</a>';
+print '<a class="button" href="'.dol_buildpath('/datapolicy/mailing.php').'">'.$langs->trans('SendAgreement').'</a>';
 
 llxFooter();
 $db->close();
diff --git a/htdocs/datapolicies/class/actions_datapolicies.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
similarity index 83%
rename from htdocs/datapolicies/class/actions_datapolicies.class.php
rename to htdocs/datapolicy/class/actions_datapolicy.class.php
index 45e443cb274..5a19b039602 100644
--- a/htdocs/datapolicies/class/actions_datapolicies.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -17,15 +17,15 @@
  */
 
 /**
- * \file    datapolicies/class/actions_datapolicies.class.php
- * \ingroup datapolicies
+ * \file    datapolicy/class/actions_datapolicy.class.php
+ * \ingroup datapolicy
  * \brief   Example hook overload.
  */
 
 /**
- * Class ActionsDatapolicies
+ * Class ActionsDatapolicy
  */
-class ActionsDatapolicies
+class ActionsDatapolicy
 {
     /**
      * @var DoliDB Database handler.
@@ -91,7 +91,7 @@ class ActionsDatapolicies
     public function doActions($parameters, &$object, &$action, $hookmanager)
     {
         global $conf, $user, $langs;
-        $langs->load('datapolicies@datapolicies');
+        $langs->load('datapolicy@datapolicy');
         $error = 0; // Error counter
 
         if (GETPOST('socid') && $parameters['currentcontext'] == 'thirdpartycard') {
@@ -129,9 +129,9 @@ class ActionsDatapolicies
                     header('Location:' . $_SERVER["PHP_SELF"] . "?socid=" . $object->id);
                 }
             }
-        } elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'datapolicies_portabilite') {
+        } elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'datapolicy_portabilite') {
             header('Content-Type: application/csv');
-            header('Content-Disposition: attachment; filename=datapolicies_portabilite.csv');
+            header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
             header('Pragma: no-cache');
             $object->fetch(GETPOST('socid'));
             echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;' . PHP_EOL;
@@ -152,9 +152,9 @@ class ActionsDatapolicies
             echo $object->skype . ';';
             echo ';';
             exit;
-        } elseif ($parameters['currentcontext'] == 'membercard' && $action == 'datapolicies_portabilite') {
+        } elseif ($parameters['currentcontext'] == 'membercard' && $action == 'datapolicy_portabilite') {
             header('Content-Type: application/csv');
-            header('Content-Disposition: attachment; filename=datapolicies_portabilite.csv');
+            header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
             header('Pragma: no-cache');
             $soc = $object->fetch_thirdparty();
 
@@ -176,10 +176,10 @@ class ActionsDatapolicies
             echo $object->skype . ';';
             echo dol_print_date($object->birth) . ';';
             exit;
-        } elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'datapolicies_portabilite') {
+        } elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'datapolicy_portabilite') {
             $object->fetch(GETPOST('id'));
             header('Content-Type: application/csv');
-            header('Content-Disposition: attachment; filename=datapolicies_portabilite.csv');
+            header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
             header('Pragma: no-cache');
             $soc = $object->fetch_thirdparty();
             echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;' . PHP_EOL;
@@ -200,23 +200,23 @@ class ActionsDatapolicies
             echo $object->jabberid . ';';
             echo dol_print_date($object->birth) . ';';
             exit;
-        } elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'send_datapolicies') {
+        } elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'send_datapolicy') {
             $object->fetch(GETPOST('id'));
 
             require_once  DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-            require_once  DOL_DOCUMENT_ROOT . '/datapolicies/class/datapolicies.class.php';
-            DataPolicies::sendMailDataPoliciesContact($object);
+            require_once  DOL_DOCUMENT_ROOT . '/datapolicy/class/datapolicy.class.php';
+            DataPolicy::sendMailDataPolicyContact($object);
         }
-         elseif ($parameters['currentcontext'] == 'membercard' && $action == 'send_datapolicies') {
+         elseif ($parameters['currentcontext'] == 'membercard' && $action == 'send_datapolicy') {
              $object->fetch(GETPOST('id'));
             require_once  DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
-            require_once  DOL_DOCUMENT_ROOT . '/datapolicies/class/datapolicies.class.php';
-            DataPolicies::sendMailDataPoliciesAdherent($object);
-        } elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'send_datapolicies') {
+            require_once  DOL_DOCUMENT_ROOT . '/datapolicy/class/datapolicy.class.php';
+            DataPolicy::sendMailDataPolicyAdherent($object);
+        } elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'send_datapolicy') {
             $object->fetch(GETPOST('socid'));
             require_once  DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-            require_once  DOL_DOCUMENT_ROOT . '/datapolicies/class/datapolicies.class.php';
-            DataPolicies::sendMailDataPoliciesCompany($object);
+            require_once  DOL_DOCUMENT_ROOT . '/datapolicy/class/datapolicy.class.php';
+            DataPolicy::sendMailDataPolicyCompany($object);
         }
 
 
@@ -280,7 +280,7 @@ class ActionsDatapolicies
 
         /* print_r($parameters); print_r($object); echo "action: " . $action; */
         if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
-            $this->resprints = '<option value="0"' . ($disabled ? ' disabled="disabled"' : '') . '>' . $langs->trans("datapoliciesMassAction") . '</option>';
+            $this->resprints = '<option value="0"' . ($disabled ? ' disabled="disabled"' : '') . '>' . $langs->trans("datapolicyMassAction") . '</option>';
         }
 
         if (!$error) {
@@ -361,18 +361,18 @@ class ActionsDatapolicies
     function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager)
     {
         global $conf, $user, $langs;
-        $langs->load('datapolicies@datapolicies');
+        $langs->load('datapolicy@datapolicy');
 
         if (! empty($conf->global->DATAPOLICIES_ENABLE_EMAILS))
         {
-	        $dialog = '<div id="dialogdatapolicies" style="display:none;" title="' . $langs->trans('DATAPOLICIES_PORTABILITE_TITLE') . '">';
+	        $dialog = '<div id="dialogdatapolicy" style="display:none;" title="' . $langs->trans('DATAPOLICIES_PORTABILITE_TITLE') . '">';
 	        $dialog .= '<div class="confirmmessage">' . img_help('', '') . ' ' . $langs->trans('DATAPOLICIES_PORTABILITE_CONFIRMATION') . '</div>';
 	        $dialog .= "</div>";
 	        $dialog .= '<script>
 	                  $( function() {
 	                    $("#rpgpdbtn").on("click", function(){
 	                        var href = $(this).attr("href");
-	                        $( "#dialogdatapolicies" ).dialog({
+	                        $( "#dialogdatapolicy" ).dialog({
 	                          modal: true,
 	                          buttons: {
 	                            "OK": function() {
@@ -392,18 +392,18 @@ class ActionsDatapolicies
 	                  </script>';
 	        echo $dialog;
 	        if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
-	            echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="' . $_SERVER["PHP_SELF"] . "?socid=" . $object->id . '&action=datapolicies_portabilite" title="' . $langs->trans('DATAPOLICIES_PORTABILITE_TITLE') . '">' . $langs->trans("DATAPOLICIES_PORTABILITE") . '</a></div>';
+	            echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="' . $_SERVER["PHP_SELF"] . "?socid=" . $object->id . '&action=datapolicy_portabilite" title="' . $langs->trans('DATAPOLICIES_PORTABILITE_TITLE') . '">' . $langs->trans("DATAPOLICIES_PORTABILITE") . '</a></div>';
 	        } elseif ($parameters['currentcontext'] == 'membercard') {
-	            echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="' . $_SERVER["PHP_SELF"] . "?rowid=" . $object->id . '&action=datapolicies_portabilite" title="' . $langs->trans('DATAPOLICIES_PORTABILITE_TITLE') . '">' . $langs->trans("DATAPOLICIES_PORTABILITE") . '</a></div>';
+	            echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="' . $_SERVER["PHP_SELF"] . "?rowid=" . $object->id . '&action=datapolicy_portabilite" title="' . $langs->trans('DATAPOLICIES_PORTABILITE_TITLE') . '">' . $langs->trans("DATAPOLICIES_PORTABILITE") . '</a></div>';
 	        } elseif ($parameters['currentcontext'] == 'contactcard') {
-	            echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="' . $_SERVER["PHP_SELF"] . "?id=" . $object->id . '&action=datapolicies_portabilite" title="' . $langs->trans('DATAPOLICIES_PORTABILITE_TITLE') . '">' . $langs->trans("DATAPOLICIES_PORTABILITE") . '</a></div>';
+	            echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="' . $_SERVER["PHP_SELF"] . "?id=" . $object->id . '&action=datapolicy_portabilite" title="' . $langs->trans('DATAPOLICIES_PORTABILITE_TITLE') . '">' . $langs->trans("DATAPOLICIES_PORTABILITE") . '</a></div>';
 	        }
-	        if (!empty($object->mail) && empty($object->array_options['options_datapolicies_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
-	            echo '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . "?socid=" . $object->id . '&action=send_datapolicies" title="' . $langs->trans('DATAPOLICIES_SEND') . '">' . $langs->trans("DATAPOLICIES_SEND") . '</a></div>';
-	        } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicies_send']) && $parameters['currentcontext'] == 'membercard') {
-	            echo '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . "?rowid=" . $object->id . '&action=send_datapolicies" title="' . $langs->trans('DATAPOLICIES_SEND') . '">' . $langs->trans("DATAPOLICIES_SEND") . '</a></div>';
-	        } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicies_send']) && $parameters['currentcontext'] == 'contactcard') {
-	            echo '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . "?id=" . $object->id . '&action=send_datapolicies" title="' . $langs->trans('DATAPOLICIES_SEND') . '">' . $langs->trans("DATAPOLICIES_SEND") . '</a></div>';
+	        if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
+	            echo '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . "?socid=" . $object->id . '&action=send_datapolicy" title="' . $langs->trans('DATAPOLICIES_SEND') . '">' . $langs->trans("DATAPOLICIES_SEND") . '</a></div>';
+	        } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'membercard') {
+	            echo '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . "?rowid=" . $object->id . '&action=send_datapolicy" title="' . $langs->trans('DATAPOLICIES_SEND') . '">' . $langs->trans("DATAPOLICIES_SEND") . '</a></div>';
+	        } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'contactcard') {
+	            echo '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . "?id=" . $object->id . '&action=send_datapolicy" title="' . $langs->trans('DATAPOLICIES_SEND') . '">' . $langs->trans("DATAPOLICIES_SEND") . '</a></div>';
 	        }
         }
     }
@@ -425,11 +425,11 @@ class ActionsDatapolicies
         if ($parameters['currentcontext'] == 'thirdpartycard') {
             if (GETPOST('action') == 'create' || GETPOST('action') == 'edit' || GETPOST('action') == '') {
                 $jsscript .= '<script>';
-                $jsscript .= "var elementToHide = 'tr.societe_extras_datapolicies_consentement, tr.societe_extras_datapolicies_opposition_traitement, tr.societe_extras_datapolicies_opposition_prospection';" . PHP_EOL;
+                $jsscript .= "var elementToHide = 'tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection';" . PHP_EOL;
                 $jsscript .= "var forme_juridique = [" . PHP_EOL;
                 $jsscript .= "11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005" . PHP_EOL;
                 $jsscript .= "];" . PHP_EOL;
-                $jsscript .= "function hideRgPD() { if ($('#typent_id').val() == 8 || forme_juridique.indexOf(parseInt($('#forme_juridique_code').val())) > -1) { console.log(elementToHide); $('tr.societe_extras_datapolicies_consentement, tr.societe_extras_datapolicies_opposition_traitement, tr.societe_extras_datapolicies_opposition_prospection').show(); } else { $('tr.societe_extras_datapolicies_consentement, tr.societe_extras_datapolicies_opposition_traitement, tr.societe_extras_datapolicies_opposition_prospection').hide(); }}" . PHP_EOL;
+                $jsscript .= "function hideRgPD() { if ($('#typent_id').val() == 8 || forme_juridique.indexOf(parseInt($('#forme_juridique_code').val())) > -1) { console.log(elementToHide); $('tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection').show(); } else { $('tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection').hide(); }}" . PHP_EOL;
                 $jsscript .= "hideRgPD();" . PHP_EOL;
                 $jsscript .= "$('#forme_juridique_code, #typent_id').change(function(){ hideRgPD(); });" . PHP_EOL;
                 $jsscript .= '</script>';
@@ -457,7 +457,7 @@ class ActionsDatapolicies
 
                     require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
                     $jsscript .= '<script>';
-                    $jsscript .= "var elementToHide = 'td.societe_extras_datapolicies_opposition_traitement, td.societe_extras_datapolicies_opposition_prospection, td.societe_extras_datapolicies_consentement';" . PHP_EOL;
+                    $jsscript .= "var elementToHide = 'td.societe_extras_datapolicy_opposition_traitement, td.societe_extras_datapolicy_opposition_prospection, td.societe_extras_datapolicy_consentement';" . PHP_EOL;
                     $jsscript .= "$(elementToHide).parent('tr').hide();" . PHP_EOL;
                     $jsscript .= '</script>';
                 }
@@ -465,8 +465,8 @@ class ActionsDatapolicies
         } elseif ($parameters['currentcontext'] == 'contactcard') {
             if (GETPOST('action') == 'create' || GETPOST('action') == 'edit') {
                 $jsscript .= '<script>';
-                $jsscript .= "$('#options_datapolicies_opposition_traitement, #options_datapolicies_opposition_prospection, input[name=\"options_datapolicies_opposition_traitement\"], input[name=\"options_datapolicies_opposition_prospection\"]').change(function(){
-                    if($('#options_datapolicies_opposition_traitement').prop('checked') == true || $('input[name=options_datapolicies_opposition_traitement]').prop('checked') || $('#options_datapolicies_opposition_prospection').prop('checked') || $('input[name=options_datapolicies_opposition_prospection]').prop('checked')) {
+                $jsscript .= "$('#options_datapolicy_opposition_traitement, #options_datapolicy_opposition_prospection, input[name=\"options_datapolicy_opposition_traitement\"], input[name=\"options_datapolicy_opposition_prospection\"]').change(function(){
+                    if($('#options_datapolicy_opposition_traitement').prop('checked') == true || $('input[name=options_datapolicy_opposition_traitement]').prop('checked') || $('#options_datapolicy_opposition_prospection').prop('checked') || $('input[name=options_datapolicy_opposition_prospection]').prop('checked')) {
                         $('#no_email').val(1);
                     }
                 });";
diff --git a/htdocs/datapolicies/class/datapolicies.class.php b/htdocs/datapolicy/class/datapolicy.class.php
similarity index 79%
rename from htdocs/datapolicies/class/datapolicies.class.php
rename to htdocs/datapolicy/class/datapolicy.class.php
index df818db6f5e..3bebdff9302 100644
--- a/htdocs/datapolicies/class/datapolicies.class.php
+++ b/htdocs/datapolicy/class/datapolicy.class.php
@@ -16,9 +16,9 @@
  */
 
 /**
- * \file    datapolicies/class/datapolicies.class.php
- * \ingroup datapolicies
- * \brief   Class to manage feature of Data Policies module.
+ * \file    datapolicy/class/datapolicy.class.php
+ * \ingroup datapolicy
+ * \brief   Class to manage feature of Data Policy module.
  */
 include_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
@@ -26,9 +26,9 @@ include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
 
 
 /**
- * Class DataPolicies
+ * Class DataPolicy
  */
-Class DataPolicies extends Contact
+Class DataPolicy extends Contact
 {
 	/**
 	 * getAllContactNotInformed
@@ -45,8 +45,8 @@ Class DataPolicies extends Contact
         $sql .= " FROM " . MAIN_DB_PREFIX . "socpeople as c";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON c.fk_soc = s.rowid";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople_extrafields as spe ON spe.fk_object = c.rowid";
-        $sql .= " WHERE (c.statut=1 AND c.no_email=0 AND (spe.datapolicies_consentement=0 OR spe.datapolicies_consentement IS NULL) AND (spe.datapolicies_opposition_traitement=0 OR spe.datapolicies_opposition_traitement IS NULL) AND (spe.datapolicies_opposition_prospection=0 OR spe.datapolicies_opposition_prospection IS NULL))";
-        $sql .= " AND spe.datapolicies_send IS NULL";
+        $sql .= " WHERE (c.statut=1 AND c.no_email=0 AND (spe.datapolicy_consentement=0 OR spe.datapolicy_consentement IS NULL) AND (spe.datapolicy_opposition_traitement=0 OR spe.datapolicy_opposition_traitement IS NULL) AND (spe.datapolicy_opposition_prospection=0 OR spe.datapolicy_opposition_prospection IS NULL))";
+        $sql .= " AND spe.datapolicy_send IS NULL";
         $sql .= " AND c.entity=" . $conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -57,7 +57,7 @@ Class DataPolicies extends Contact
                 $contact = new Contact($db);
                 $contact->fetch($obj->rowid);
 
-                DataPolicies::sendMailDataPoliciesContact($contact);
+                DataPolicy::sendMailDataPolicyContact($contact);
                 $i++;
             }
         } else {
@@ -80,8 +80,8 @@ Class DataPolicies extends Contact
         $sql = "SELECT s.rowid";
         $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_extrafields as se ON se.fk_object = s.rowid";
-        $sql .= " WHERE s.statut=0 AND (se.datapolicies_consentement=0 OR se.datapolicies_consentement IS NULL) AND (se.datapolicies_opposition_traitement=0 OR se.datapolicies_opposition_traitement IS NULL) AND (se.datapolicies_opposition_prospection=0 OR se.datapolicies_opposition_prospection IS NULL)";
-        $sql .= " AND se.datapolicies_send IS NULL";
+        $sql .= " WHERE s.statut=0 AND (se.datapolicy_consentement=0 OR se.datapolicy_consentement IS NULL) AND (se.datapolicy_opposition_traitement=0 OR se.datapolicy_opposition_traitement IS NULL) AND (se.datapolicy_opposition_prospection=0 OR se.datapolicy_opposition_prospection IS NULL)";
+        $sql .= " AND se.datapolicy_send IS NULL";
         $sql .= " AND s.entity=" . $conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -92,7 +92,7 @@ Class DataPolicies extends Contact
                 $societe = new Societe($db);
                 $societe->fetch($obj->rowid);
 
-                DataPolicies::sendMailDataPoliciesCompany($societe);
+                DataPolicy::sendMailDataPolicyCompany($societe);
                 $i++;
             }
         } else {
@@ -115,8 +115,8 @@ Class DataPolicies extends Contact
         $sql = "SELECT a.rowid";
         $sql .= " FROM " . MAIN_DB_PREFIX . "adherent as a";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "adherent_extrafields as ae ON ae.fk_object = a.rowid";
-        $sql .= " WHERE a.statut=0 AND (ae.datapolicies_consentement=0 OR ae.datapolicies_consentement IS NULL) AND (ae.datapolicies_opposition_traitement=0 OR ae.datapolicies_opposition_traitement IS NULL) AND (ae.datapolicies_opposition_prospection=0 OR ae.datapolicies_opposition_prospection IS NULL)";
-        $sql .= " AND ae.datapolicies_send IS NULL";
+        $sql .= " WHERE a.statut=0 AND (ae.datapolicy_consentement=0 OR ae.datapolicy_consentement IS NULL) AND (ae.datapolicy_opposition_traitement=0 OR ae.datapolicy_opposition_traitement IS NULL) AND (ae.datapolicy_opposition_prospection=0 OR ae.datapolicy_opposition_prospection IS NULL)";
+        $sql .= " AND ae.datapolicy_send IS NULL";
         $sql .= " AND a.entity=" . $conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -127,7 +127,7 @@ Class DataPolicies extends Contact
                 $adherent = new Adherent($db);
                 $adherent->fetch($obj->rowid);
 
-                DataPolicies::sendMailDataPoliciesAdherent($adherent);
+                DataPolicy::sendMailDataPolicyAdherent($adherent);
                 $i++;
             }
         } else {
@@ -137,19 +137,19 @@ Class DataPolicies extends Contact
     }
 
     /**
-     * sendMailDataPoliciesContact
+     * sendMailDataPolicyContact
      *
      * @param 	mixed		$contact		Contact
      * @return	void
      */
-    function sendMailDataPoliciesContact($contact)
+    function sendMailDataPolicyContact($contact)
     {
      	global $langs, $conf, $db, $user;
 
      	$error = 0;
 
      	$from = $user->getFullName($langs) . ' <' . $user->email . '>';
-     	$replyto = $from;
+
      	$sendto = $contact->email;
      	$code= md5($contact->email);
      	if (!empty($contact->default_lang)) {
@@ -171,8 +171,8 @@ Class DataPolicies extends Contact
      	$deliveryreceipt = 0;
 
      	$substitutionarray = array(
-     	'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=1&c='.$contact->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linka.'</a>',
-     	'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=2&c='.$contact->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linkr.'</a>',
+     	'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&c='.$contact->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linka.'</a>',
+     	'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&c='.$contact->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linkr.'</a>',
      	'__FIRSTNAME__' => $contact->firstname,
      	'__NAME__' => $contact->lastname,
      	'__CIVILITY__' => $contact->civility,
@@ -202,7 +202,7 @@ Class DataPolicies extends Contact
      		if (!$error) {
 
      			$resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "<br>";
-     			$contact->array_options['options_datapolicies_send'] = date('Y-m-d', time());
+     			$contact->array_options['options_datapolicy_send'] = date('Y-m-d', time());
      			$contact->update($contact->id);
 
      		} else {
@@ -213,19 +213,19 @@ Class DataPolicies extends Contact
     }
 
     /**
-     * sendMailDataPoliciesCompany
+     * sendMailDataPolicyCompany
      *
      * @param Societe	$societe	Object societe
      * @return	void
      */
-    function sendMailDataPoliciesCompany($societe)
+    function sendMailDataPolicyCompany($societe)
     {
      	global $langs, $conf, $db, $user;
 
      	$error = 0;
 
      	$from = $user->getFullName($langs) . ' <' . $user->email . '>';
-     	$replyto = $from;
+
      	$sendto = $societe->email;
 
      	$code= md5($societe->email);
@@ -248,8 +248,8 @@ Class DataPolicies extends Contact
      	$deliveryreceipt = 0;
 
      	$substitutionarray = array(
-            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=1&s='.$societe->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linka.'</a>',
-            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=2&s='.$societe->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linkr.'</a>',
+            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&s='.$societe->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linka.'</a>',
+            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&s='.$societe->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linkr.'</a>',
      	);
      	$subject = make_substitutions($subject, $substitutionarray);
      	$message = make_substitutions($message, $substitutionarray);
@@ -275,7 +275,7 @@ Class DataPolicies extends Contact
 
      		if (!$error) {
      			$resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "<br>";
-     			$societe->array_options['options_datapolicies_send'] = date('Y-m-d', time());
+     			$societe->array_options['options_datapolicy_send'] = date('Y-m-d', time());
      			$societe->update($societe->id);
      		} else {
      			dol_print_error($db);
@@ -285,19 +285,19 @@ Class DataPolicies extends Contact
     }
 
     /**
-     * sendMailDataPoliciesAdherent
+     * sendMailDataPolicyAdherent
      *
      * @param Adherent	$adherent		Member
      * @return void
      */
-    function sendMailDataPoliciesAdherent($adherent)
+    function sendMailDataPolicyAdherent($adherent)
     {
     	global $langs, $conf, $db, $user;
 
     	$error = 0;
 
     	$from = $user->getFullName($langs) . ' <' . $user->email . '>';
-    	$replyto = $from;
+
     	$sendto = $adherent->email;
 
     	$code= md5($adherent->email);
@@ -318,8 +318,8 @@ Class DataPolicies extends Contact
     	$deliveryreceipt = 0;
 
     	$substitutionarray = array(
-            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=1&a='.$adherent->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linka.'</a>',
-            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=2&a='.$adherent->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linkr.'</a>',
+            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&a='.$adherent->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linka.'</a>',
+            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&a='.$adherent->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linkr.'</a>',
     	);
     	$subject = make_substitutions($subject, $substitutionarray);
     	$message = make_substitutions($message, $substitutionarray);
@@ -346,7 +346,7 @@ Class DataPolicies extends Contact
 
     		if (!$error) {
     			$resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "<br>";
-    			$adherent->array_options['options_datapolicies_send'] = date('Y-m-d', time());
+    			$adherent->array_options['options_datapolicy_send'] = date('Y-m-d', time());
     			$adherent->update($user);
 
     		} else {
diff --git a/htdocs/datapolicies/class/datapoliciescron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
similarity index 98%
rename from htdocs/datapolicies/class/datapoliciescron.class.php
rename to htdocs/datapolicy/class/datapolicycron.class.php
index c87df67498d..f6de8b9b498 100644
--- a/htdocs/datapolicies/class/datapoliciescron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -17,15 +17,15 @@
  */
 
 /**
- * \file    datapolicies/class/datapoliciescron.class.php
- * \ingroup datapolicies
+ * \file    datapolicy/class/datapolicycron.class.php
+ * \ingroup datapolicy
  * \brief   Example hook overload.
  */
 
 /**
- * Class DataPoliciesCron
+ * Class DataPolicyCron
  */
-class DataPoliciesCron
+class DataPolicyCron
 {
 	/**
 	 * Function exec
@@ -36,7 +36,7 @@ class DataPoliciesCron
     {
         global $conf, $db, $langs, $user;
 
-        $langs->load('datapolicies@datapolicies');
+        $langs->load('datapolicy@datapolicy');
 
         // FIXME Removed hardcoded values of id
         $arrayofparameters=array(
@@ -510,11 +510,11 @@ class DataPoliciesCron
     {
         global $conf, $db, $langs, $user;
 
-        $langs->load('datapolicies@datapolicies');
+        $langs->load('datapolicy@datapolicy');
 
-        require_once DOL_DOCUMENT_ROOT . '/datapolicies/class/datapolicies.class.php';
+        require_once DOL_DOCUMENT_ROOT . '/datapolicy/class/datapolicy.class.php';
 
-        $contacts = new DataPolicies($db);
+        $contacts = new DataPolicy($db);
         $contacts->getAllContactNotInformed();
         $contacts->getAllCompaniesNotInformed();
         $contacts->getAllAdherentsNotInformed();
diff --git a/htdocs/datapolicies/img/datapolicies.png b/htdocs/datapolicy/img/datapolicy.png
similarity index 100%
rename from htdocs/datapolicies/img/datapolicies.png
rename to htdocs/datapolicy/img/datapolicy.png
diff --git a/htdocs/datapolicies/img/gfdl.png b/htdocs/datapolicy/img/gfdl.png
similarity index 100%
rename from htdocs/datapolicies/img/gfdl.png
rename to htdocs/datapolicy/img/gfdl.png
diff --git a/htdocs/datapolicies/img/gplv3.png b/htdocs/datapolicy/img/gplv3.png
similarity index 100%
rename from htdocs/datapolicies/img/gplv3.png
rename to htdocs/datapolicy/img/gplv3.png
diff --git a/htdocs/datapolicies/img/object_datapolicies.png b/htdocs/datapolicy/img/object_datapolicy.png
similarity index 100%
rename from htdocs/datapolicies/img/object_datapolicies.png
rename to htdocs/datapolicy/img/object_datapolicy.png
diff --git a/htdocs/datapolicies/img/object_inoveaconseil.png b/htdocs/datapolicy/img/object_inoveaconseil.png
similarity index 100%
rename from htdocs/datapolicies/img/object_inoveaconseil.png
rename to htdocs/datapolicy/img/object_inoveaconseil.png
diff --git a/htdocs/datapolicy/langs/en_US/datapolicy.lang b/htdocs/datapolicy/langs/en_US/datapolicy.lang
new file mode 100644
index 00000000000..ddcd2180cb0
--- /dev/null
+++ b/htdocs/datapolicy/langs/en_US/datapolicy.lang
@@ -0,0 +1,92 @@
+# Copyright (C) 2018 Nicolas ZABOURI    <info@inovea-conseil.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Module label 'ModuledatapolicyName'
+Module4100Name = Data Privacy Policy
+# Module description 'ModuledatapolicyDesc'
+Module4100Desc = Module to manage Data Privacy (Conformity with the GDPR)
+
+#
+# Page d'administration
+#
+datapolicySetup = Module Data Privacy Policy Setup
+Deletion = Deletion of data
+datapolicySetupPage = Depending of laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding that necessary for the purposes for which they were collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without event (the duration which you will have indicated below).
+NB_MONTHS = %s months
+ONE_YEAR = 1 year
+NB_YEARS = %s years
+DATAPOLICY_TIERS_CLIENT = Customer
+DATAPOLICY_TIERS_PROSPECT = Prospect
+DATAPOLICY_TIERS_PROSPECT_CLIENT = Prospect/Customer
+DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
+DATAPOLICY_TIERS_FOURNISSEUR = Supplier
+DATAPOLICY_CONTACT_CLIENT = Customer
+DATAPOLICY_CONTACT_PROSPECT = Prospect
+DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospect/Customer
+DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
+DATAPOLICY_CONTACT_FOURNISSEUR = Supplier
+DATAPOLICY_ADHERENT = Member
+DATAPOLICY_Tooltip_SETUP = Type of contact - Indicate your choices for each type.
+DATAPOLICYMail=Emails Setup
+DATAPOLICYSUBJECTMAIL=Subject of email
+DATAPOLICYCONTENTMAIL=Content of the email
+DATAPOLICYSUBSITUTION=You can use the following variables in your email (LINKACCEPT allows to create a link recording the agreement of the person, LINKREFUSED makes it possible to record the refusal of the person):
+DATAPOLICYACCEPT=Message after agreement
+DATAPOLICYREFUSE=Message after desagreement
+SendAgreementText=You can send a GDPR email to all your relevant contacts (who have not yet received an email and for which you have not registered anything about their GDPR agreement). To do this, use the following button.
+SendAgreement=Send emails
+AllAgreementSend = All emails have been sent
+TXTLINKDATAPOLICYACCEPT= Text for the link "agreement" 
+TXTLINKDATAPOLICYREFUSE= Text for the link "desagreement" 
+
+
+#
+# Extrafield
+#
+DATAPOLICY_BLOCKCHECKBOX = GDPR : Processing of personal data
+DATAPOLICY_consentement = Consent obtained for the processing of personal data 
+DATAPOLICY_opposition_traitement = Opposes the processing of his personal data
+DATAPOLICY_opposition_prospection = Opposes the processing of his personal data for the purposes of prospecting
+
+#
+# Popup
+#
+DATAPOLICY_POPUP_ANONYME_TITLE = Anonymize a thirdparty
+DATAPOLICY_POPUP_ANONYME_TEXTE = You can not delete this contact from Dolibarr because there are related items. In accordance with the GDPR, you will make all this data anonymous to respect your obligations. Would you like to continue ?
+
+#
+# Bouton portabilité
+# 
+DATAPOLICY_PORTABILITE = Portability GDPR
+DATAPOLICY_PORTABILITE_TITLE = Export of personal data
+DATAPOLICY_PORTABILITE_CONFIRMATION = You want to export the personal data of this contact. Are you sure ?
+
+#
+# Note ajoutés lors d'une anonymisation
+#
+ANONYMISER_AT = Anonymised the %s
+
+#V2
+DATAPOLICYReturn=GDPR Validation
+DATAPOLICY_date = Date of agreement/desagreement GDPR
+DATAPOLICY_send = Date sending agreement email
+DATAPOLICYReturn = GDPR Return
+DATAPOLICY_SEND = Send GDPR email
+MailSent = Email has been sent
+
+#ERROR
+ErrorSubjectIsRequired= Error : The subject of email is required. Indicate it in the module setup
+=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to send us your choice.
+NUMBER_MONTH_BEFORE_DELETION = Number of month before deletion
diff --git a/htdocs/datapolicy/langs/fr_FR/datapolicy.lang b/htdocs/datapolicy/langs/fr_FR/datapolicy.lang
new file mode 100644
index 00000000000..7ee710aae2e
--- /dev/null
+++ b/htdocs/datapolicy/langs/fr_FR/datapolicy.lang
@@ -0,0 +1,97 @@
+# Copyright (C) 2018  INOVEA CONSEil info@inovea-conseil.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Générique
+#
+
+# Module label 'ModuledatapolicyName'
+Module4100Name = Protection des Données
+# Module description 'ModuledatapolicyDesc'
+Module4100Desc = Module de gestion de la protection des données (RGPD)
+
+#
+# Page d'administration
+#
+datapolicySetup = Configuration du module Protection des données
+Settings_DATAPOLICY = Paramétrage du module Protection des données
+datapolicySetupPage = Selon la loi de votre pays (Exemple <a href="http://www.privacy-regulation.eu/fr/5.htm" target="_blank">l’article 5</a> du RGPD), les données à caractère personnel doivent être conservées pendant une durée n’excédant pas celle nécessaire au regard des finalités pour lesquelles elles ont été traitées, à l’exception de fins archivistiques. La suppression se fera automatiquement après une certaine durée sans évènement (la durée que vous aurez indiquée ci-dessous).
+NB_MONTHS = %s mois
+ONE_YEAR = 1 an
+NB_YEARS = %s ans
+DATAPOLICY_TIERS_CLIENT = Client
+DATAPOLICY_TIERS_PROSPECT = Prospect
+DATAPOLICY_TIERS_PROSPECT_CLIENT = Prospect/Client
+DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Ni prospect / Ni client
+DATAPOLICY_TIERS_FOURNISSEUR = Fournisseur
+DATAPOLICY_CONTACT_CLIENT = Client
+DATAPOLICY_CONTACT_PROSPECT = Prospect
+DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospect/Client
+DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ni prospect / Ni client
+DATAPOLICY_CONTACT_FOURNISSEUR = Fournisseur
+DATAPOLICY_ADHERENT = Adhérent
+DATAPOLICY_Tooltip_SETUP = Type du contact - Indiquez vos choix pour chaque type.
+DATAPOLICYMail=Paramétrage des emails
+DATAPOLICYSUBJECTMAIL=Objet du mail
+DATAPOLICYCONTENTMAIL=Contenu du mail
+DATAPOLICYSUBSITUTION=Vous pouvez utiliser les variables suivantes dans votre email (LINKACCEPT permet de créer un lien enregistrant l'acceptation de la personne, LINKREFUSED permet d'enregistrer le refus de la personne) :
+DATAPOLICYACCEPT=Message suite acceptation
+DATAPOLICYREFUSE=Message suite opposition
+SendAgreementText=Vous pouvez envoyer un email DATAPOLICY à tous vos contacts concernés (qui n'ont pas encore reçus de mail et pour lesquels vous n'avez rien enregistré concernant leur accord/désaccord DATAPOLICY). Pour cela, utilisez le bouton suivant.
+SendAgreement=Envoyer les emails
+AllAgreementSend = Tous les e-mails de consentement ont été envoyés
+TXTLINKDATAPOLICYACCEPT= Texte du lien d'acceptation
+TXTLINKDATAPOLICYREFUSE= Texte du lien d'opposition
+
+
+
+#
+# Extrafield
+#
+DATAPOLICY_BLOCKCHECKBOX = DATAPOLICY : Traitement des données à caractère personnel
+DATAPOLICY_consentement = Consentement recueilli pour le traitement des données à caractère personnel le concernant
+DATAPOLICY_opposition_traitement = S’oppose au traitement de ses données à caractère personnel
+DATAPOLICY_opposition_prospection = S’oppose au traitement de ses données à caractère personnel à des fins de prospection
+
+#
+# Popup
+#
+DATAPOLICY_POPUP_ANONYME_TITLE = Anonymiser un tiers
+DATAPOLICY_POPUP_ANONYME_TEXTE = Vous ne pouvez pas supprimer ce contact de Dolibarr car des éléments y sont liés. Conformément au DATAPOLICY, vous allez rendre toutes ces données anonymes afin de respecter vos obligations. Souhaitez-vous continuer ?
+
+#
+# Bouton portabilité
+# 
+DATAPOLICY_PORTABILITE = Portabilité DATAPOLICY
+DATAPOLICY_PORTABILITE_TITLE = Export des données à caractère personnel
+DATAPOLICY_PORTABILITE_CONFIRMATION = Vous souhaitez exporter les données à caractère personnel de ce contact. Etes-vous sûr ?
+
+#
+# Note ajoutés lors d'une anonymisation
+#
+ANONYMISER_AT = Anonymisé le %s
+
+#V2
+DATAPOLICYReturn=Validation DATAPOLICY
+DATAPOLICY_date=Date d'accord/opposition au traitement
+DATAPOLICY_send=Date envoi consentement
+DATAPOLICYReturn=Retour DATAPOLICY
+DATAPOLICY_SEND=Envoyer l'email de consentement
+MailSent=L'email a bien été envoyé
+
+#ERROR
+ErrorSubjectIsRequired=Erreur : vous n'avez pas indiqué l'objet de l'email dans la configuration
+=Suite à un problème technique, nous n'avons pas pu enregistrer votre choix. Nous nous en excusons. Contactez-nous pour nous transmettre votre choix.
+NUMBER_MONTH_BEFORE_DELETION = Nombre de mois avant suppression des données
diff --git a/htdocs/datapolicy/langs/it_IT/datapolicy.lang b/htdocs/datapolicy/langs/it_IT/datapolicy.lang
new file mode 100644
index 00000000000..d8858b56c5b
--- /dev/null
+++ b/htdocs/datapolicy/langs/it_IT/datapolicy.lang
@@ -0,0 +1,78 @@
+# Copyright (C) 2018 INOVEA CONSEIl info@inovea-conseil.com - Thanks to Claudio Aschieri
+#
+# # Module label 'ModuledatapolicyName'
+Module4100Name = Data Policy
+# Module description 'ModuledatapolicyDesc'
+Module4100Desc = Conformità con GDPR
+
+#
+# Page d'administration
+#
+datapolicySetup = Module Setup
+Settings_DATAPOLICY = Configurazione modulo GDPR 
+datapolicySetupPage = In accordo con <a href="http://www.privacy-regulation.eu/it/5.htm" target="_blank">l'art 5 del GDPR </a> i dati personali devono essere conservati per un periodo di tempo che .... ed eliminati se non sono più utili agli scopi per cui sono stati processati.
+NB_MONTHS = %s mesi
+ONE_YEAR = 1 anno
+NB_YEARS = %s anni
+DATAPOLICY_TIERS_CLIENT = Cliente
+DATAPOLICY_TIERS_PROSPECT = Fornitore
+DATAPOLICY_TIERS_PROSPECT_CLIENT = Potenziale Cliente / Cliente
+DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Nè potenziale cliente / Nè cliente
+DATAPOLICY_TIERS_FOURNISSEUR = Fornitore
+DATAPOLICY_CONTACT_CLIENT = Cliente
+DATAPOLICY_CONTACT_PROSPECT = Potenziale cliente
+DATAPOLICY_CONTACT_PROSPECT_CLIENT = Potenziale Cliente / Cliente
+DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nè potenziale cliente / Nè cliente
+DATAPOLICY_CONTACT_FOURNISSEUR = Fornitore
+DATAPOLICY_ADHERENT = Membri
+DATAPOLICY_Tooltip_SETUP = Tipo di contatto - Indica la scelta per ogni tipologia
+DATAPOLICYMail=Configurazione Email
+DATAPOLICYSUBJECTMAIL=Subject dell'e-mail
+DATAPOLICYCONTENTMAIL=Contenuto dell'e-mail
+DATAPOLICYSUBSITUTION=Puoi utilizzare le seguenti variabili nella tua email (LINKACCEPT consente di creare un link per registrare l'accettazione della persona, LINKREFUSED consente di registrare il rifiuto della persona):
+DATAPOLICYACCEPT= Messaggio dopo il consenso
+DATAPOLICYREFUSE=Messaggio dopo il rifiuto
+SendAgreementText=Puoi inviare un'email GDPR a tutti i tuoi contatti rilevanti (che non hanno ancora ricevuto un'e-mail e per i quali non hai registrato nulla sul loro accordo GDPR). Per fare ciò, utilizzare il seguente pulsante.
+SendAgreement=Invia emails
+AllAgreementSend = Tutte le email sono state inviate
+TXTLINKDATAPOLICYACCEPT= Testo per il link "Consenso" 
+TXTLINKDATAPOLICYREFUSE= Testo per il link "Consenso negato" 
+
+#
+# Extrafield
+#
+DATAPOLICY_BLOCKCHECKBOX = GDPR : Trattamento dei dati personali
+DATAPOLICY_consentement = Consenso ottenuto al Trattamento dei dati personali
+DATAPOLICY_opposition_traitement = Consenso negato al trattamento dei dati personali
+DATAPOLICY_opposition_prospection = Consenso negato al trattamento dei dati personali a fini commerciali
+
+#
+# Popup
+#
+DATAPOLICY_POPUP_ANONYME_TITLE = Anonimizza un soggetto terzo
+DATAPOLICY_POPUP_ANONYME_TEXTE = Impossibile eliminare questo contatto da Dolibarr perchè vi sono elementi collegati. In conformità con il GDPR, renderai tutti questi dati anonimi per rispettare i tuoi obblighi. Vuoi continuare?
+
+
+#
+# Bouton portabilité
+# 
+DATAPOLICY_PORTABILITE = Portabilità GDPR
+DATAPOLICY_PORTABILITE_TITLE = Esporta i dati personali
+DATAPOLICY_PORTABILITE_CONFIRMATION = Vuoi davvero esportare i dati personali di questo contatto?
+
+#
+# Note ajoutée lors d'une anonymisation
+#
+ANONYMISER_AT = Anonimizzato il %s
+
+#V2
+DATAPOLICYReturn=GDPR Validazione
+DATAPOLICY_date = Data di accordo / disaccordo GDPR
+DATAPOLICY_send = Data di invio del consenso (e-mail)
+DATAPOLICYReturn = GDPR ritorno
+DATAPOLICY_SEND = Inviare GDPR e-mail
+MailSent=L'email è stata inviata
+
+#ERROR
+ErrorSubjectIsRequired= Errore: L'oggetto della mail è obbligatorio. Inserisci l'oggetto nella configurazione del modulo.
+=A causa di un problema tecnico, non siamo stati in grado di registrare la tua scelta. Ci scusiamo per questo. Contattaci per inviarci la tua scelta.
diff --git a/htdocs/datapolicies/lib/datapolicies.lib.php b/htdocs/datapolicy/lib/datapolicy.lib.php
similarity index 72%
rename from htdocs/datapolicies/lib/datapolicies.lib.php
rename to htdocs/datapolicy/lib/datapolicy.lib.php
index cca255801a8..41c92299989 100644
--- a/htdocs/datapolicies/lib/datapolicies.lib.php
+++ b/htdocs/datapolicy/lib/datapolicy.lib.php
@@ -16,9 +16,9 @@
  */
 
 /**
- * \file    datapolicies/lib/datapolicies.lib.php
- * \ingroup datapolicies
- * \brief   Library files with common functions for datapolicies
+ * \file    datapolicy/lib/datapolicy.lib.php
+ * \ingroup datapolicy
+ * \brief   Library files with common functions for datapolicy
  */
 
 /**
@@ -26,29 +26,29 @@
  *
  * @return array
  */
-function datapoliciesAdminPrepareHead()
+function datapolicyAdminPrepareHead()
 {
 	global $langs, $conf;
 
-	$langs->load("datapolicies@datapolicies");
+	$langs->load("datapolicy@datapolicy");
 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/datapolicies/admin/setup.php", 1);
-	$head[$h][1] = $langs->trans("Settings_DATAPOLICIES");
+	$head[$h][0] = dol_buildpath("/datapolicy/admin/setup.php", 1);
+	$head[$h][1] = $langs->trans("Deletion");
 	$head[$h][2] = 'settings';
 	$h++;
 
 	if (! empty($conf->global->DATAPOLICIES_ENABLE_EMAILS))
 	{
-		$head[$h][0] = dol_buildpath("/datapolicies/admin/setupmail.php", 1);
+		$head[$h][0] = dol_buildpath("/datapolicy/admin/setupmail.php", 1);
 		$head[$h][1] = $langs->trans("DATAPOLICIESMail");
 		$head[$h][2] = 'settings';
 		$h++;
 	}
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'datapolicies');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'datapolicy');
 
 	return $head;
 }
diff --git a/htdocs/datapolicies/mailing.php b/htdocs/datapolicy/mailing.php
similarity index 81%
rename from htdocs/datapolicies/mailing.php
rename to htdocs/datapolicy/mailing.php
index 08c24d9aceb..d65b2bdced4 100644
--- a/htdocs/datapolicies/mailing.php
+++ b/htdocs/datapolicy/mailing.php
@@ -16,26 +16,26 @@
  */
 
 /**
- * \file    datapolicies/mailing.php
- * \ingroup datapolicies
- * \brief   datapolicies mailing page.
+ * \file    datapolicy/mailing.php
+ * \ingroup datapolicy
+ * \brief   datapolicy mailing page.
  */
 
 require '../../main.inc.php';
 dol_include_once('/contact/class/contact.class.php');
-dol_include_once('/datapolicies/class/datapolicies.class.php');
+dol_include_once('/datapolicy/class/datapolicy.class.php');
 
 $idcontact = GETPOST('idc');
 
 if(!empty($idcontact)){
     $contact = new Contact($db);
     $contact->fetch($idcontact);
-    DataPolicies::sendMailDataPoliciesContact($contact);
+    DataPolicy::sendMailDataPolicyContact($contact);
 
 
 }else{
 
-    $contacts = new DataPolicies($db);
+    $contacts = new DataPolicy($db);
     $contacts->getAllContactNotInformed();
     $contacts->getAllCompaniesNotInformed();
     $contacts->getAllAdherentsNotInformed();
diff --git a/htdocs/datapolicies/modulebuilder.txt b/htdocs/datapolicy/modulebuilder.txt
similarity index 100%
rename from htdocs/datapolicies/modulebuilder.txt
rename to htdocs/datapolicy/modulebuilder.txt
diff --git a/htdocs/datapolicies/public/index.php b/htdocs/datapolicy/public/index.php
similarity index 66%
rename from htdocs/datapolicies/public/index.php
rename to htdocs/datapolicy/public/index.php
index 7ecceeb9940..58f7968f05d 100644
--- a/htdocs/datapolicies/public/index.php
+++ b/htdocs/datapolicy/public/index.php
@@ -17,9 +17,9 @@
  */
 
 /**
- * \file    datapolicies/admin/setup.php
- * \ingroup datapolicies
- * \brief   datapolicies setup page.
+ * \file    datapolicy/admin/setup.php
+ * \ingroup datapolicy
+ * \brief   datapolicy setup page.
  */
 
 if (!defined('NOLOGIN'))
@@ -34,7 +34,7 @@ dol_include_once('/contact/class/contact.class.php');
 dol_include_once('/societe/class/societe.class.php');
 dol_include_once('/adherents/class/adherent.class.php');
 dol_include_once('/user/class/user.class.php');
-dol_include_once('/datapolicies/class/datapolicies.class.php');
+dol_include_once('/datapolicy/class/datapolicy.class.php');
 
 $idc = GETPOST('c', 'int');
 $ids = GETPOST('s', 'int');
@@ -45,7 +45,7 @@ $code = GETPOST('key', 'alpha');
 
 $acc = "DATAPOLICIESACCEPT_" . $lang;
 $ref = "DATAPOLICIESREFUSE_" . $lang;
-$langs->load('datapolicies@datapolicies',0,0,$lang);
+$langs->load('datapolicy@datapolicy',0,0,$lang);
 
 if (empty($action) || (empty($idc) && empty($ids) && empty($ida))) {
     return 0;
@@ -56,18 +56,18 @@ if (empty($action) || (empty($idc) && empty($ids) && empty($ida))) {
     if ($check != $code) {
         $return = $langs->trans('ErrorEmailDATAPOLICIES');
     } elseif ($action == 1) {
-        $contact->array_options['options_datapolicies_consentement'] = 1;
-        $contact->array_options['options_datapolicies_opposition_traitement'] = 0;
-        $contact->array_options['options_datapolicies_opposition_prospection'] = 0;
-        $contact->array_options['options_datapolicies_date'] = date('Y-m-d', time());
+        $contact->array_options['options_datapolicy_consentement'] = 1;
+        $contact->array_options['options_datapolicy_opposition_traitement'] = 0;
+        $contact->array_options['options_datapolicy_opposition_prospection'] = 0;
+        $contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
         $return = $conf->global->$acc;
     } elseif ($action == 2) {
         $contact->no_email = 1;
-        $contact->array_options['options_datapolicies_consentement'] = 0;
-        $contact->array_options['options_datapolicies_opposition_traitement'] = 1;
-        $contact->array_options['options_datapolicies_opposition_prospection'] = 1;
-        $contact->array_options['options_datapolicies_date'] = date('Y-m-d', time());
+        $contact->array_options['options_datapolicy_consentement'] = 0;
+        $contact->array_options['options_datapolicy_opposition_traitement'] = 1;
+        $contact->array_options['options_datapolicy_opposition_prospection'] = 1;
+        $contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
         $return = $conf->global->$ref;
     }
@@ -79,16 +79,16 @@ if (empty($action) || (empty($idc) && empty($ids) && empty($ida))) {
     if ($check != $code) {
         $return = $langs->trans('ErrorEmailDATAPOLICIES');
     } elseif ($action == 1) {
-        $societe->array_options['options_datapolicies_consentement'] = 1;
-        $societe->array_options['options_datapolicies_opposition_traitement'] = 0;
-        $societe->array_options['options_datapolicies_opposition_prospection'] = 0;
-        $societe->array_options['options_datapolicies_date'] = date('Y-m-d', time());
+        $societe->array_options['options_datapolicy_consentement'] = 1;
+        $societe->array_options['options_datapolicy_opposition_traitement'] = 0;
+        $societe->array_options['options_datapolicy_opposition_prospection'] = 0;
+        $societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
         $return = $conf->global->$acc;
     } elseif ($action == 2) {
-        $societe->array_options['options_datapolicies_consentement'] = 0;
-        $societe->array_options['options_datapolicies_opposition_traitement'] = 1;
-        $societe->array_options['options_datapolicies_opposition_prospection'] = 1;
-        $societe->array_options['options_datapolicies_date'] = date('Y-m-d', time());
+        $societe->array_options['options_datapolicy_consentement'] = 0;
+        $societe->array_options['options_datapolicy_opposition_traitement'] = 1;
+        $societe->array_options['options_datapolicy_opposition_prospection'] = 1;
+        $societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
         $return = $conf->global->$ref;
     }
@@ -100,16 +100,16 @@ if (empty($action) || (empty($idc) && empty($ids) && empty($ida))) {
     if ($check != $code) {
         $return = $langs->trans('ErrorEmailDATAPOLICIES');
     } elseif ($action == 1) {
-        $adherent->array_options['options_datapolicies_consentement'] = 1;
-        $adherent->array_options['options_datapolicies_opposition_traitement'] = 0;
-        $adherent->array_options['options_datapolicies_opposition_prospection'] = 0;
-        //$adherent->array_options['options_datapolicies_date'] = date('Y-m-d', time());
+        $adherent->array_options['options_datapolicy_consentement'] = 1;
+        $adherent->array_options['options_datapolicy_opposition_traitement'] = 0;
+        $adherent->array_options['options_datapolicy_opposition_prospection'] = 0;
+        //$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
         $return = $conf->global->$acc;
     } elseif ($action == 2) {
-        $adherent->array_options['options_datapolicies_consentement'] = 0;
-        $adherent->array_options['options_datapolicies_opposition_traitement'] = 1;
-        $adherent->array_options['options_datapolicies_opposition_prospection'] = 1;
-        //$adherent->array_options['options_datapolicies_date'] = date('Y-m-d', time());
+        $adherent->array_options['options_datapolicy_consentement'] = 0;
+        $adherent->array_options['options_datapolicy_opposition_traitement'] = 1;
+        $adherent->array_options['options_datapolicy_opposition_prospection'] = 1;
+        //$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
         $return = $conf->global->$ref;
     }
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 7475c1640e6..0e59bf9a5a3 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -58,19 +58,19 @@ AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal
 AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
 AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.    
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
 AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
 AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.    
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
 AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
 AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s. 
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
 AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>. 
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -165,7 +165,7 @@ NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
 GroupByAccountAccounting=Group by accounting account
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.  
+AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=By accounts
 ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
@@ -191,7 +191,7 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-AddCompteFromBK=Add accounting accounts to the group 
+AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d4665bb4ccd..4630757dbad 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -23,7 +23,7 @@ FilesUpdated=Updated Files
 FilesModified=Modified Files
 FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package 
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -96,9 +96,9 @@ NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
 AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\Progra~1\ClamWin\bin\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParam= More parameters on command line
-AntiVirusParamExample= Example for ClamWin: --database="C:\Program Files (x86)\ClamWin\lib"
+AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Accounting module setup
 UserSetup=User management setup
 MultiCurrencySetup=Multi-currency setup
@@ -184,7 +184,7 @@ AddDropTable=Add DROP TABLE command
 ExportStructure=Structure
 NameColumn=Name columns
 ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT 
+NoLockBeforeInsert=No lock commands around INSERT
 DelayedInsert=Delayed insert
 EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
@@ -199,7 +199,7 @@ ModulesDeployDesc=If permissions on your file system allow it, you can use this
 ModulesMarketPlaces=Find external app/modules
 ModulesDevelopYourModule=Develop your own app/modules
 ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
-DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
+DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
 NewModule=New
 FreeModule=Free
 CompatibleUpTo=Compatible with version %s
@@ -208,7 +208,7 @@ CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s
 SeeInMarkerPlace=See in Market place
 Updated=Updated
 Nouveauté=Novelty
-AchatTelechargement=Buy / Download 
+AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
@@ -229,7 +229,7 @@ DoNotStoreClearPassword=Do no store clear passwords in database but store only e
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Protection of generated PDF files NOT recommended, breaks mass PDF generation)
+ProtectAndEncryptPdfFiles=Protection of generated PDF files NOT recommended (breaks mass PDF generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
 Feature=Feature
 DolibarrLicense=License
@@ -286,7 +286,7 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
-SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
@@ -309,11 +309,11 @@ DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is steps to process:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
-FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
+FindPackageFromWebSite=Find a package that provides features you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into the server directory dedicated to Dolibarr: <b>%s</b>
 UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
 NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
 InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
@@ -333,7 +333,7 @@ GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask. 
+GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
 DoTestServerAvailability=Test server connectivity
@@ -347,25 +347,25 @@ SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and t
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link to online help "<b>%s</b>"
-AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...). 
+AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
+ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
 MinLength=Minimum length
 LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
 LanguageFile=Language file
 ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>. 
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation: 
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Position of Name/Lastname
 DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values:
 KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
 TestSubmitForm=Input test form
-ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours. 
+ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours.
 ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
+ConnectionTimeout=Connection timeout
 ResponseTimeout=Response timeout
 SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
 ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
@@ -377,7 +377,7 @@ PDFAddressForging=Rules to forge address boxes
 HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
+HideLocalTaxOnPDF=Hide %s rate in pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
 HideRefOnPDF=Hide products ref. on generated PDF
 HideDetailsOnPDF=Hide product lines details on generated PDF
@@ -387,7 +387,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons to non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -408,13 +408,13 @@ ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator (not a field)
 ExtrafieldPassword=Password
-ExtrafieldRadio=Radio buttons (on choice only)
+ExtrafieldRadio=Radio buttons (one choice only)
 ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
-ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -439,7 +439,7 @@ InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=Erase all current barcode values
 ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
 AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
+NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the barcode module setup.
 EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
@@ -450,22 +450,22 @@ EnableAndSetupModuleCron=If you want to have this recurring invoice generated au
 ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
 ModuleCompanyCodeSupplierAquarium=%s followed by supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
-ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.  
+ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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 a server of them, so few of your sent Emails may not be accepted (be careful also to your email provider 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 (ask your EMail provider to get SMTP credentials for your account).
+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 their, 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 (ask your Email provider to get SMTP credentials for your account).
 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>.
 ClickToShowDescription=Click to show description
-DependsOn=This module need the module(s)
+DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
+TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
+PageUrlForDefaultValues=You must enter the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list third-parties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 EnableDefaultValues=Enable usage of personalized default values
-EnableOverwriteTranslation=Enable usage of overwrote translation
+EnableOverwriteTranslation=Enable usage of overwritten translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. 
+WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
 Field=Field
 ProductDocumentTemplates=Document templates to generate product document
 FreeLegalTextOnExpenseReports=Free legal text on expense reports
@@ -476,7 +476,7 @@ SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
 DAVSetup=Setup of module DAV
 DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access  (in read and write mode), with no need to have/use an existing login/password account.
 DAV_ALLOW_ECM_DIR=Enable the root directy of DMS/ECM module (login required)
 DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Like for the feature from the web interface, you will need a valid login/password with granted permissions to access it.
 # Modules
@@ -487,7 +487,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
+Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -541,9 +541,9 @@ Module200Desc=LDAP directory synchronization
 Module210Name=PostNuke
 Module210Desc=PostNuke integration
 Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Tool to export Dolibarr data (with assistance)
 Module250Name=Data imports
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Tool to import data into Dolibarr (with assistance)
 Module310Name=Members
 Module310Desc=Foundation members management
 Module320Name=RSS Feed
@@ -584,7 +584,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Track events. Let Dolibarr log automatic events for tracking purposes or record manual events or meetings. This is the main important module for a good Customer or Supplier Relationship Management.
+Module2400Desc=Track events. Let Dolibarr log automatic events for tracking purposes or record manual events or meetings. This is the main module for good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -592,9 +592,9 @@ Module2600Desc=Enable the Dolibarr SOAP server providing API services
 Module2610Name=API/Web services (REST server)
 Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
+Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Supplier orders currently supported.)
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
+Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
 Module2800Desc=FTP Client
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
@@ -625,7 +625,7 @@ Module50150Desc=Point of sales module (Touch screen POS).
 Module50200Name=Paypal
 Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
+Module50400Desc=Accounting management (double entries, support general and auxiliary 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
@@ -692,7 +692,7 @@ Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
 Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
+Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
 Permission117=Manage cheques dispatching
@@ -700,25 +700,25 @@ Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
+Permission141=Read all projects and tasks (also private projects I am not a contact for)
+Permission142=Create/modify all projects and tasks (also private projects I am not a contact for)
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read direct debit payment orders
 Permission152=Create/modify a direct debit payment orders
 Permission153=Send/Transmit direct debit payment orders
-Permission154=Record Credits/Rejects of direct debit payment orders
+Permission154=Record Credits/Rejections of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
 Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates) 
+Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses 
+Permission174=Read all trips and expenses
 Permission178=Export trips and expenses
 Permission180=Read suppliers
 Permission181=Read supplier orders
@@ -761,7 +761,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative for).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -771,7 +771,7 @@ Permission283=Delete contacts
 Permission286=Export contacts
 Permission291=Read tariffs
 Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
+Permission293=Modify customers tariffs
 Permission300=Read bar codes
 Permission301=Create/modify bar codes
 Permission302=Delete bar codes
@@ -810,7 +810,7 @@ Permission538=Export services
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates) 
+Permission771=Read expense reports (yours and your subordinates)
 Permission772=Create/modify expense reports
 Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
@@ -848,8 +848,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 customer orders and attributes
-Permission20001=Read leave requests (your leaves and the one of your subordinates)
-Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
+Permission20001=Read leave requests (your leave and that of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and that of your subordinates)
 Permission20003=Delete leave requests
 Permission20004=Read all leave requests (even of user not subordinates)
 Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
@@ -915,7 +915,7 @@ DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
+DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
@@ -962,7 +962,7 @@ CalcLocaltax3=Sales
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
-LabelOrTranslationKey=Label or translation key 
+LabelOrTranslationKey=Label or translation key
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1072,7 +1072,7 @@ DisplayDesc=You can choose each parameter related to the Dolibarr look and feel
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
 SessionTimeOut=Time out for session
-SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every <b>%s/%s</b> access, but only during access made by other sessions.<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default <strong>session.gc_maxlifetime</strong>, no matter what the value entered here. 
+SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions.<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default <strong>session.gc_maxlifetime</strong>, no matter what the value entered here is.
 TriggersAvailable=Available triggers
 TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
 TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
@@ -1097,17 +1097,17 @@ NoEventFoundWithCriteria=No security event has been found for this search criter
 SeeLocalSendMailSetup=See your local sendmail setup
 BackupDesc=To make a complete backup of Dolibarr, you must:
 BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
+BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
 BackupDescX=Archived directory should be stored in a secure place.
 BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup cannot be guaranteed with this method. Prefer previous one
+BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
 RestoreDesc=To restore a Dolibarr backup, you must:
 RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 RestoreDesc3=Restore the 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 restore is finished, you must use a login/password, that existed when backup was made, to connect again. 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
 PreviousDumpFiles=Generated database backup files
-WeekStartOnDay=First day of week 
+WeekStartOnDay=First day of week
 RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
 YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
@@ -1130,7 +1130,7 @@ MAIN_PROXY_HOST=Name/Address of proxy server
 MAIN_PROXY_PORT=Port of proxy server
 MAIN_PROXY_USER=Login to use the proxy server
 MAIN_PROXY_PASS=Password to use the proxy server
-DefineHereComplementaryAttributes=Define here any attributes not already available by default, that you want to be supported for %s.
+DefineHereComplementaryAttributes=Define any attributes not already available by default, that you want to be supported for %s here.
 ExtraFields=Complementary attributes
 ExtraFieldsLines=Complementary attributes (lines)
 ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
@@ -1151,13 +1151,13 @@ AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
 PathToDocuments=Path to documents
 PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
+SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
 TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
 TranslationString=Translation string
 CurrentTranslationString=Current translation string
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
@@ -1166,16 +1166,16 @@ OriginalValueWas=The original translation is overwritten. Original value was:<br
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
 TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
+ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
 OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are opened to external users (whatever the permissions of such users) and only if permissions are granted:
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
+YouUseBestDriver=You use driver %s which is the best driver available currently.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
+YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
 XDebugInstalled=XDebug is loaded.
@@ -1188,7 +1188,7 @@ FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are ex
 GetBarCode=Get barcode
 ##### Module password generation
 PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
-PasswordGenerationNone=Do not suggest any generated password. Password must be typed in manually.
+PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
 PasswordPatternDesc=Password pattern description
@@ -1217,7 +1217,7 @@ MustBeMandatory=Mandatory to create third parties (if vat number or type of comp
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
 #####DAV #####
-WebDAVSetupDesc=This is the links to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that need an existing login account/password to access to.
+WebDAVSetupDesc=This is the links to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that need an existing login account/password to access.
 WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
@@ -1225,6 +1225,7 @@ WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at follow
 BillsSetup=Invoices module setup
 BillsNumberingModule=Invoices and credit notes numbering model
 BillsPDFModules=Invoice documents models
+BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 CreditNote=Credit note
 CreditNotes=Credit notes
@@ -1366,8 +1367,8 @@ LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Example : samaccountname
 LDAPFieldFullname=Full name
 LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
+LDAPFieldPasswordNotCrypted=Password not encrypted
+LDAPFieldPasswordCrypted=Password encrypted
 LDAPFieldPasswordExample=Example : userPassword
 LDAPFieldCommonNameExample=Example : cn
 LDAPFieldName=Name
@@ -1415,10 +1416,10 @@ LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP
 LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=You will find on this page some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slow down by this.
+YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
+NotInstalled=Not installed, so your server is not slowed down by 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. 
+MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
 OPCodeCache=OPCode cache
@@ -1433,9 +1434,9 @@ CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gi
 CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
 CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers 
-DefaultValuesDesc=You can define/force here the default value you want to get when you create a new record, and/or default filters or sort order when your list record.
-DefaultCreateForm=Default values (on forms to create)
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+DefaultValuesDesc=Here you can define/force the default value you want to have when you create a new record, and/or default filters or sort order when your list records.
+DefaultCreateForm=Default values (to create on forms)
 DefaultSearchFilters=Default search filters
 DefaultSortOrder=Default sort orders
 DefaultFocus=Default focus fields
@@ -1445,11 +1446,11 @@ ProductSetup=Products module setup
 ServiceSetup=Services module setup
 ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
-ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
+ViewProductDescInFormAbility=Display product descriptions in forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the language of the third party
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
 UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Wait you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
 UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
@@ -1465,7 +1466,7 @@ 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
-CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug) 
+CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
 SyslogFileNumberOfSaves=Log backups
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
@@ -1486,7 +1487,7 @@ BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
 BarcodeDescDATAMATRIX=Barcode of type Datamatrix
 BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode 
+GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
@@ -1529,7 +1530,7 @@ FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database does not appear to be an OSCommerce database (Key %s not found in table %s).
 OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
+OSCommerceTestKo1=Connection to server '%s' succeeded but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
 StockSetup=Stock module setup
@@ -1563,7 +1564,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
 FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due 
+OptionVatMode=VAT due
 OptionVATDefault=Standard basis
 OptionVATDebitOption=Accrual basis
 OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
@@ -1582,15 +1583,15 @@ InvoiceDateUsed=Invoice date used
 YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code 
+AccountancyCodeBuy=Purchase account. code
 ##### Agenda #####
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
 PastDelayVCalExport=Do not export event older than
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of event into event create form
-AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
+AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
+AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
@@ -1599,17 +1600,17 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of sales
 CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sales
 CashDeskBankAccountForSell=Default account to use to receive cash payments
 CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
 CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
 StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
@@ -1630,7 +1631,7 @@ ApiProductionMode=Enable production mode (this will activate use of a cache for
 ApiExporerIs=You can explore and test the APIs at URL
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it. 
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1682,7 +1683,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type 
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1694,14 +1695,14 @@ YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for E
 ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
-GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
+GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contact addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do. 
+SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong> 
+ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 HighlightLinesChecked=Highlight color of the line when it is checked (keep empty for no highlight)
@@ -1729,7 +1730,7 @@ UrlTrackingDesc=If the provider or transport service offer a page or web site to
 OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of lead, this amount may be multiplied by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
 TemplateForElement=This template record is dedicated to which element
 TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Template is visible by owner only
+TemplateIsVisibleByOwnerOnly=Template is visible to owner only
 VisibleEverywhere=Visible everywhere
 VisibleNowhere=Visible nowhere
 FixTZ=TimeZone fix
@@ -1755,10 +1756,10 @@ YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features or data structure change is present in this version. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, here you can enter a rule to have a price for each level autocalculated according to the price of first level, so you will have to only enter a price for the first level on each product. This page is here to save you time and can be useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto define barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
 AllPublishers=All publishers
@@ -1779,19 +1780,19 @@ AddOtherPagesOrServices=Add other pages or services
 AddModels=Add document or numbering templates
 AddSubstitutions=Add keys substitutions
 DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and must be provided on each API call) 
+UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you try to run is not in the list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
 LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
 ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permission defined
+UserHasNoPermissions=This user has no permissions defined
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
 BaseCurrency=Reference currency of the company (go into setup of company to change this)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016). 
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated. 
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not impact adversely the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of a illegal software.
+WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
+WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
 MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
@@ -1802,10 +1803,10 @@ EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous fiel
 SeveralLangugeVariatFound=Several language variants found
 COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
-GDPRContact=Privacy Policies or GDPR contact
-GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContactDesc=If you store data about European companies/citizen, you can store the contact who is responsible for the General Data Protection Regulation here
 HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put here a text or a translation key for a text to show on a tooltip when this field appears into a form
+HelpOnTooltipDesc=Put text or a translation key here for the text to show on a tooltip when this field appears in a form
 YouCanDeleteFileOnServerWith=You can delete this file on server with Command Line:<br>%s
 ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
@@ -1814,7 +1815,7 @@ VATIsUsedIsOff=Note: The option to use sales Tax or VAT has been set to <strong>
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only
 ##### Resource ####
-ResourceSetup=Configuration du module Resource 
+ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
 DisabledResourceLinkUser=Disable feature to link a resource to users
 DisabledResourceLinkContact=Disable feature to link a resource to contacts
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index a68bac6d961..cd39a43abe8 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -1,12 +1,12 @@
-# Dolibarr language file - Source file is en_US - agenda 
+# Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID event
 Actions=Events
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agendas
 LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by 
-ActionsOwnedByShort=Owner 
+ActionsOwnedBy=Event owned by
+ActionsOwnedByShort=Owner
 AffectedTo=Assigned to
 Event=Event
 Events=Events
@@ -31,8 +31,8 @@ ViewWeek=Week view
 ViewPerUser=Per user view
 ViewPerType=Per type view
 AutoActions= Automatic filling
-AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked, only manual actions will be included in logged and visible into agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved. 
-AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
+AgendaAutoActionDesc= Here you can define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaSetupOtherDesc= This page provides options to allow exports of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
 AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
 ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
 EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
@@ -111,7 +111,7 @@ DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
 AgendaExtNb=Calendar no. %s
 ExtSiteUrlAgenda=URL to access .ical file
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index a83b3cd755b..7650613341e 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -46,7 +46,7 @@ BankAccountDomiciliation=Account address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means the information for this account number is incomplete or incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
@@ -105,7 +105,7 @@ SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -136,8 +136,8 @@ BankTransactionLine=Bank entry
 AllAccounts=All bank and cash accounts
 BackToAccount=Back to account
 ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
+FutureTransaction=Transaction in future. No way to reconcile.
+SelectChequeTransactionAndGenerate=Select/filter checks to include in the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
 ToConciliate=To reconcile?
@@ -163,4 +163,4 @@ ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to 
+FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 0eb53d1af98..f2a46bd3077 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -25,12 +25,12 @@ InvoiceProFormaAsk=Proforma invoice
 InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
 InvoiceReplacement=Replacement invoice
 InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
 InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
+InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice has an amount that differs from the amount really paid (eg customer paid too much by mistake, or will not pay completely since he returned some products).
 invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice 
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
 ReplaceInvoice=Replace invoice %s
 ReplacementInvoice=Replacement invoice
@@ -66,12 +66,12 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Delete payment
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount?<br>The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Payments paid to suppliers
 ReceivedCustomersPaymentsToValid=Received customers payments to validate
 PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=Payments reports
@@ -91,8 +91,8 @@ PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoice.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
@@ -146,7 +146,7 @@ ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
 ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
@@ -180,20 +180,20 @@ ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to sta
 ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice?
+ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason/s for you closing this invoice?
 ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. 
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comment. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Other
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
@@ -304,8 +304,8 @@ DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
 SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
+HelpEscompte=This discount is a discount granted to customer because payment was made before term.
+HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Payment id
@@ -323,19 +323,19 @@ InvoiceNotChecked=No invoice selected
 CloneInvoice=Clone invoice
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only record with payment during the fixed year are included here.
+DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
 NbOfPayments=No. of payments
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts?
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 smaller discounts?
 TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount. 
+TotalOfTwoDiscountMustEqualsOriginal=Total of two new discounts must be equal to original discount amount.
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
 RelatedCustomerInvoices=Related customer invoices
 RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
@@ -346,7 +346,7 @@ ListOfSituationInvoices=List of situation invoices
 CurrentSituationTotal=Total current situation
 DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
 RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ? 
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
 ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
@@ -410,8 +410,8 @@ PaymentTypeCHQ=Check
 PaymentTypeShortCHQ=Check
 PaymentTypeTIP=TIP (Documents against Payment)
 PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
+PaymentTypeVAD=Online payment
+PaymentTypeShortVAD=Online payment
 PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
@@ -438,7 +438,7 @@ NetToBePaid=Net to be paid
 PhoneNumber=Tel
 FullPhoneNumber=Telephone
 TeleFax=Fax
-PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.  
+PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
 IntracommunityVATNumber=Intracommunity number of VAT
 PaymentByChequeOrderedTo=Check payment (including tax) are payable to %s send to
 PaymentByChequeOrderedToShort=Check payment (including tax) are payable to
@@ -447,7 +447,7 @@ PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank acc
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
+LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=their price.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Apply
@@ -476,19 +476,19 @@ Reported=Delayed
 DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoices from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoices from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -535,7 +535,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index fb52e8476ee..88d3662be9c 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log is not valid. It means someone (a hacker?) has modified some datas of this archived log after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log is not valid. It means someone (a hacker?) has modified some data of this archived log after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log is valid. It means all data on this line were not modified and record follow the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
@@ -22,7 +22,7 @@ logPAYMENT_CUSTOMER_CREATE=Customer payment created
 logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
 logDONATION_PAYMENT_CREATE=Donation payment created
 logDONATION_PAYMENT_DELETE=Donation payment logical deletion
-logBILL_PAYED=Customer invoice payed
+logBILL_PAYED=Customer invoice paid
 logBILL_UNPAYED=Customer invoice set unpaid
 logBILL_VALIDATE=Customer invoice validated
 logBILL_SENTBYMAIL=Customer invoice send by mail
@@ -49,5 +49,5 @@ BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be req
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
 BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
 OnlyNonValid=Non-valid
-TooManyRecordToScanRestrictFilters=Too many record to scan/analyze. Please restrict list with more restrictive filters.
+TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
 RestrictYearToExport=Restrict month / year to export
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index cc46e702a75..8a519879ac3 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -15,7 +15,7 @@ BoxLastSuppliers=Latest modified suppliers
 BoxLastCustomerOrders=Latest customer orders
 BoxLastActions=Latest actions
 BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contact addresses
+BoxLastContacts=Latest contacts/addresses
 BoxLastMembers=Latest members
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
@@ -34,7 +34,7 @@ BoxTitleLastFicheInter=Latest %s modified interventions
 BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
 BoxTitleOldestUnpaidSupplierBills=Supplier Invoices: oldest %s unpaid
 BoxTitleCurrentAccounts=Open Accounts: balances
-BoxTitleLastModifiedContacts=Contact addresses: latest %s modified
+BoxTitleLastModifiedContacts=Contacts/Addresses: latest %s modified
 BoxMyLastBookmarks=Bookmarks: latest %s modified
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
@@ -83,4 +83,4 @@ ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Add widget to your dashboard
-BoxAdded=Widget was added in your dashboard
\ No newline at end of file
+BoxAdded=Widget was added in your dashboard
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index a130ce82f79..0a0deb99a1f 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -76,4 +76,4 @@ WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
 SignatureProposalRef=Signature of quote/commercial proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled  
\ No newline at end of file
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index ef0328b9349..e026ac5673d 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -3,7 +3,7 @@ ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
 ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
-DeleteContact=Delete a contact address
+DeleteContact=Delete a contact/address
 ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
@@ -19,9 +19,9 @@ ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
 IdContact=Contact Id
-Contacts=Contact addresses
-ThirdPartyContacts=Third party contact addresses
-ThirdPartyContact=Third party contact address
+Contacts=Contacts/Addresses
+ThirdPartyContacts=Third party contacts
+ThirdPartyContact=Third party contact/address
 Company=Company
 CompanyName=Company name
 AliasNames=Alias name (commercial, trademark, ...)
@@ -40,7 +40,7 @@ ThirdPartyCustomersWithIdProf12=Customers with %s or %s
 ThirdPartySuppliers=Vendors
 ThirdPartyType=Type of company
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a contact address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
+ToCreateContactWithSameName=Will create a Third Party and a linked Contact/Address with same information as the Third Party. In most cases, even if your Third Party is a physical person, creating a Third Party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByMonth=Report by month
@@ -274,8 +274,8 @@ CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
 HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
 HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
-CompanyHasAbsoluteDiscount=This customer has discount available (credits notes or down payments) for <b>%s</b> %s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
+CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
 HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
 HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
@@ -289,16 +289,16 @@ SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Vendor
 AddContact=Create contact
-AddContactAddress=Create contact address
+AddContactAddress=Create contact/address
 EditContact=Edit contact
-EditContactAddress=Edit contact address
+EditContactAddress=Edit contact/address
 Contact=Contact
 ContactId=Contact id
-ContactsAddresses=Contact addresses
+ContactsAddresses=Contacts/Addresses
 FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
-DefaultContact=Default contact address
+DefaultContact=Default contact/address
 AddThirdParty=Create third party
 DeleteACompany=Delete a company
 PersonalInformations=Personal data
@@ -312,11 +312,11 @@ SupplierCodeDesc=Vendor Code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
 RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controlled by module
-ThisIsModuleRules=This is rules for this module
+ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
 CompanyDeleted=Company "%s" deleted from database.
-ListOfContacts=List of contact addresses
-ListOfContactsAddresses=List of contact addresses
+ListOfContacts=List of contacts/addresses
+ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
 ShowCompany=Show Third Party
 ShowContact=Show contact
@@ -333,19 +333,19 @@ NoContactForAnyProposal=This contact is not a contact for any commercial proposa
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
 NewContact=New contact
-NewContactAddress=New Contact address
+NewContactAddress=New Contact/Address
 MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor vendor
+ThisUserIsNot=This user is not a prospect, customer or vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> uses the European VAT checker service (VIES). An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check intra-Community VAT on the European Commission website
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
-NorProspectNorCustomer=Nor prospect, nor customer
+NorProspectNorCustomer=Not prospect, or customer
 JuridicalStatus=Legal Entity Type
 Staff=Staff
 ProspectLevelShort=Potential
@@ -390,7 +390,7 @@ NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Third Parties (companies/foundations/physical people) and their properties
 ExportDataset_company_2=Contacts and their properties
 ImportDataset_company_1=Third Parties (companies/foundations/physical people) and their properties
-ImportDataset_company_2=Contact addresses and attributes
+ImportDataset_company_2=Contacts/Addresses and attributes
 ImportDataset_company_3=Bank accounts of Third Parties
 ImportDataset_company_4=Third Parties - sales representatives (assign sales representatives/users to companies)
 PriceLevel=Price level
@@ -409,7 +409,7 @@ YouMustCreateContactFirst=To be able to add email notifications, you must first
 ListSuppliersShort=List of Vendors
 ListProspectsShort=List of Prospects
 ListCustomersShort=List of Customers
-ThirdPartiesArea=Third Parties and Contacts addresses area
+ThirdPartiesArea=Third Parties/Contacts
 LastModifiedThirdParties=Last %s modified Third Parties
 UniqueThirdParties=Total of Third Parties
 InActivity=Open
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 3a18ae3e376..6ad5e357b35 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -6,7 +6,7 @@ OptionMode=Option for accountancy
 OptionModeTrue=Option Incomes-Expenses
 OptionModeVirtual=Option Claims-Debts
 OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
-OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output. 
+OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
 FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
 VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
 LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
@@ -29,7 +29,7 @@ BalanceBefore=Balance (before)
 Balance=Balance
 Debit=Debit
 Credit=Credit
-Piece=Accounting Doc. 
+Piece=Accounting Doc.
 AmountHTVATRealReceived=Net collected
 AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
@@ -167,7 +167,7 @@ RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accou
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are nor included
+DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
@@ -191,7 +191,7 @@ RulesVATInProducts=- For material assets, the report includes the VAT received o
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
 RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
-ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values 
+ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/invoice
 NotUsedForGoods=Not used on goods
 ProposalStats=Statistics on proposals
@@ -203,7 +203,7 @@ ToDispatch=To dispatch
 ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
 SellsJournal=Sales Journal
 PurchasesJournal=Purchases Journal
-DescSellsJournal=Sales Journal 
+DescSellsJournal=Sales Journal
 DescPurchasesJournal=Purchases Journal
 InvoiceRef=Invoice ref.
 CodeNotDef=Not defined
@@ -256,4 +256,4 @@ PaidDuringThisPeriod=Paid during this period
 ByVatRate=By sale tax rate
 TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
-PurchasebyVatrate=Purchase by sale tax rate
\ No newline at end of file
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index f968d2ac1fb..63d56feca61 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -11,11 +11,11 @@ URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes 
+CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles 
+CronJobProfiles=List of predefined cron job profiles
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index 1c9cb791900..0d432c3f426 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -17,11 +17,11 @@ DeliveryNotValidated=Delivery not validated
 StatusDeliveryCanceled=Canceled
 StatusDeliveryDraft=Draft
 StatusDeliveryValidated=Received
-# merou PDF model						   
-NameAndSignature=Name and Signature : 
+# merou PDF model
+NameAndSignature=Name and Signature :
 ToAndDate=To___________________________________ on ____/_____/__________
 GoodStatusDeclaration=Have received the goods above in good condition,
-Deliverer=Deliverer : 
+Deliverer=Deliverer :
 Sender=Sender
 Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang
index 0993d8bfb9a..59e7cc058f4 100644
--- a/htdocs/langs/en_US/dict.lang
+++ b/htdocs/langs/en_US/dict.lang
@@ -354,4 +354,4 @@ ExpAuto13PCV=13 CV and more
 ExpCyclo=Capacity lower to 50cm3
 ExpMoto12CV=Motorbike 1 or 2 CV
 ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
\ No newline at end of file
+ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang
index 748057cc9cc..5edc8d62033 100644
--- a/htdocs/langs/en_US/donations.lang
+++ b/htdocs/langs/en_US/donations.lang
@@ -27,7 +27,7 @@ IConfirmDonationReception=The recipient declare reception, as a donation, of the
 MinimumAmount=Minimum amount is  %s
 FreeTextOnDonations=Free text to show in footer
 FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned 
+DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
 DonationPayment=Donation payment
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 9e179519739..29dbf4b4287 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -74,7 +74,7 @@ ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
 ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD) 
+ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
@@ -116,7 +116,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> can't be negative on such type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to restore old behaviour. 
+ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> can't be negative on such type of invoice. If you want to add a discount line, just create the discount first with link %s on screen and apply it to invoice. You can also ask your admin to set option FACTURE_ENABLE_NEGATIVE_LINES to 1 to restore old behaviour.
 ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
@@ -140,7 +140,7 @@ ErrorBadFormat=Bad format!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
 ErrorPriceExpression1=Cannot assign to constant '%s'
 ErrorPriceExpression2=Cannot redefine built-in function '%s'
 ErrorPriceExpression3=Undefined variable '%s' in function definition
@@ -198,7 +198,7 @@ ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong
 ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
 ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
 ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid. 
+ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
 ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
 ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
@@ -213,7 +213,7 @@ ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with fre
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 
 # Warnings
-WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.  
+WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
 WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
@@ -221,14 +221,14 @@ WarningPassIsEmpty=Warning, database password is empty. This is a security hole.
 WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
 WarningsOnXLines=Warnings on <b>%s</b> source record(s)
 WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Missing this file is a security hole. 
+WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Missing this file is a security hole.
 WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
 WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
 WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
 WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. 
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit. 
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index fa34b7f49ae..179556ddb19 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -84,7 +84,7 @@ TooMuchErrors=There are still <b>%s</b> other source lines with errors but outpu
 TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
 EmptyLine=Empty line (will be discarded)
 CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
-FileWasImported=File was imported with number <b>%s</b>. 
+FileWasImported=File was imported with number <b>%s</b>.
 YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
 NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
 NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
@@ -118,7 +118,7 @@ SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude th
 KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for update attempt
 UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
-NoUpdateAttempt=No update attempt was performed, only insert 
+NoUpdateAttempt=No update attempt was performed, only insert
 ImportDataset_user_1=Users (employees or not) and properties
 ComputedField=Computed field
 ## filters
@@ -130,4 +130,4 @@ FormatControlRule=Format control rule
 KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
-MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
\ No newline at end of file
+MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
diff --git a/htdocs/langs/en_US/externalsite.lang b/htdocs/langs/en_US/externalsite.lang
index afec761f5fe..da4853df0df 100644
--- a/htdocs/langs/en_US/externalsite.lang
+++ b/htdocs/langs/en_US/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Setup link to external website
 ExternalSiteURL=External Site URL
 ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
-ExampleMyMenuEntry=My menu entry
\ No newline at end of file
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/en_US/ftp.lang b/htdocs/langs/en_US/ftp.lang
index d6b9d2ca070..8ecb0c55cad 100644
--- a/htdocs/langs/en_US/ftp.lang
+++ b/htdocs/langs/en_US/ftp.lang
@@ -11,4 +11,4 @@ FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
 FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
 FTPPassiveMode=Passive mode
 ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
\ No newline at end of file
+FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 5c9c9e04200..1411ae3ad56 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Leave
+CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
 DateFinCP=End date
@@ -15,7 +15,7 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=List of leave
 LeaveId=Leave ID
 ReviewedByCP=Will be approved by
 UserForApprovalID=User for approval ID
@@ -25,8 +25,8 @@ UserForApprovalLogin=Login of approval user
 DescCP=Description
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+MenuConfCP=Balance of leave
+SoldeCPUser=Leave balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -85,7 +85,7 @@ NewSoldeCP=New Balance
 alreadyCPexist=A leave request has already been done on this period.
 FirstDayOfHoliday=First day of vacation
 LastDayOfHoliday=Last day of vacation
-BoxTitleLastLeaveRequests=Latest %s modified leave requests 
+BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
@@ -101,8 +101,8 @@ LEAVE_SICK=Sick leave
 LEAVE_OTHER=Other leave
 LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=Latest automatic update of leave allocation
+MonthOfLastMonthlyUpdate=Month of latest automatic update of leave allocation
 UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
@@ -121,4 +121,4 @@ HolidaysCanceled=Canceled leaved request
 HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index e8a89657b6a..bcca348c861 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -127,9 +127,9 @@ OpenBaseDir=PHP openbasedir parameter
 YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
 YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
 NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for customer orders storage 
-MigrationShippingDelivery=Upgrade storage of shipping 
-MigrationShippingDelivery2=Upgrade storage of shipping 2 
+MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
+MigrationShippingDelivery=Upgrade storage of shipping
+MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
 LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
@@ -208,4 +208,4 @@ ErrorFoundDuringMigration=Error(s) were reported during the migration process so
 YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
\ No newline at end of file
+ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
diff --git a/htdocs/langs/en_US/ldap.lang b/htdocs/langs/en_US/ldap.lang
index 67824ccd237..abe11602147 100644
--- a/htdocs/langs/en_US/ldap.lang
+++ b/htdocs/langs/en_US/ldap.lang
@@ -24,4 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
-PasswordOfUserInLDAP=Password of user in LDAP
\ No newline at end of file
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/en_US/link.lang b/htdocs/langs/en_US/link.lang
index 77a1814f1ca..fdcf07aeff4 100644
--- a/htdocs/langs/en_US/link.lang
+++ b/htdocs/langs/en_US/link.lang
@@ -7,4 +7,4 @@ ErrorFileNotLinked=The file could not be linked
 LinkRemoved=The link %s has been removed
 ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
 ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
-URLToLink=URL to link
\ No newline at end of file
+URLToLink=URL to link
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 6c6b31db764..d4f835874e7 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -45,7 +45,7 @@ MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Email recipient is empty
 WarningNoEMailsAdded=No new Email to add to recipient's list.
 ConfirmValidMailing=Are you sure you want to validate this emailing?
-ConfirmResetMailing=Warning, by reinitializing emailing <b>%s</b>, you will allow resending this email in a mass mailing. Are you sure you this is what you want to do?
+ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b> , you will allow resending this email in a mass mailing. Are you sure you want to do this?
 ConfirmDeleteMailing=Are you sure you want to delete this emailing?
 NbOfUniqueEMails=No. of unique emails
 NbOfEMails=No. of EMails
@@ -75,7 +75,7 @@ OnlyPDFattachmentSupported=If the PDF documents were already generated for the o
 AllRecipientSelected=The recipients of the %s record selected (if their email is known).
 GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them. 
+WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=No. selected
 NbIgnored=No. ignored
@@ -99,13 +99,13 @@ MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
 LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
-NbOfCompaniesContacts=Unique contact addresses
+NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
-MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. 
+MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
 ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
 LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Clear list
@@ -121,7 +121,7 @@ TagUnsubscribe=Unsubscribe link
 TagSignature=Signature of sending user
 EMailRecipient=Recipient EMail
 TagMailtoEmail=Recipient EMail (including html "mailto:" link)
-NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile. 
+NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
@@ -133,12 +133,12 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor) 
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
 NbOfTargetedContacts=Current number of targeted contact emails
 UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the third parties or contact addresses to target
+AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
@@ -159,8 +159,8 @@ AdvTgtDeleteFilter=Delete filter
 AdvTgtSaveFilter=Save filter
 AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
-NoContactWithCategoryFound=No contact address with a category found
-NoContactLinkedToThirdpartieWithCategoryFound=No contact address with a category found
+NoContactWithCategoryFound=No contact/address with a category found
+NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 5a017330f20..fb2f2a8e9fb 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -50,21 +50,21 @@ ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
 ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
 ErrorInternalErrorDetected=Error detected
 ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
+ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
+ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
 ErrorWrongValue=Wrong value
 ErrorWrongValueForParameterX=Wrong value for parameter %s
 ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for the moment. Try again later.
+ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
 ErrorDuplicateField=Duplicate value in a unique field
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback changes.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
+ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max number of record per page
+ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a current one
+MaxNbOfRecordPerPage=Max number of records per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
@@ -78,7 +78,7 @@ FileRenamed=The file was successfully renamed
 FileGenerated=The file was successfully generated
 FileSaved=The file was successfully saved
 FileUploaded=The file was successfully uploaded
-FileTransferComplete=File(s) was uploaded successfully
+FileTransferComplete=File(s) uploaded successfully
 FilesDeleted=File(s) successfully deleted
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=No. of entries
@@ -154,7 +154,7 @@ Update=Update
 Close=Close
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
 Delete=Delete
 Remove=Remove
 Resiliate=Terminate
@@ -232,7 +232,7 @@ Numero=Number
 Limit=Limit
 Limits=Limits
 Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b> 
+NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
 Connection=Login
 Setup=Setup
 Alert=Alert
@@ -348,7 +348,7 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (net of tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already payed, original currency
+MulticurrencyAlreadyPaid=Already paid, original currency
 MulticurrencyRemainderToPay=Remain to pay, original currency
 MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (net of tax), original currency
@@ -429,12 +429,12 @@ ActionNotApplicable=Not applicable
 ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
+ActionUncomplete=Incomplete
 LatestLinkedEvents=Latest %s linked events
 CompanyFoundation=Company/Organization
 Accountant=Accountant
 ContactsForCompany=Contacts for this third party
-ContactsAddressesForCompany=Contact addresses for this third party
+ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events about this third party
 ActionsOnMember=Events about this member
@@ -445,7 +445,7 @@ Completed=Completed
 Running=In progress
 RequestAlreadyDone=Request already recorded
 Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s 
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
 RemoveFilter=Remove filter
 ChartGenerated=Chart generated
 ChartNotGenerated=Chart not generated
@@ -507,7 +507,7 @@ None=None
 NoneF=None
 NoneOrSeveral=None or several
 Late=Late
-LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
+LateDesc=The delay to define if a record is late or not depends on your setup. Ask your admin to change the delay from menu Home - Setup - Alerts.
 NoItemLate=No late item
 Photo=Picture
 Photos=Pictures
@@ -659,14 +659,14 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
-CurrentValue=Current Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
 Canceled=Canceled
 YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
 YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
 Color=Color
 Documents=Linked files
 Documents2=Documents
@@ -692,7 +692,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
-Informations=Informations
+Informations=Information
 Page=Page
 Notes=Notes
 AddNewLine=Add new line
@@ -705,14 +705,14 @@ Merge=Merge
 DocumentModelStandardPDF=Standard PDF template
 PrintContentArea=Show page to print main content area
 MenuManager=Menu manager
-WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use the application at the moment.
+WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode, so only login <b>%s</b> is allowed to use the application at this time.
 CoreErrorTitle=System error
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Credit card
 ValidatePayment=Validate payment
 CreditOrDebitCard=Credit or debit card
 FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
+FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
 AccordingToGeoIPDatabase=(according to GeoIP conversion)
 Line=Line
 NotSupported=Not supported
@@ -794,7 +794,7 @@ PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
 ShowIntervention=Show intervention
 ShowContract=Show contract
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
+GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
 ListOf=List of %s
@@ -926,15 +926,15 @@ SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
+SearchIntoLeaves=Leave
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
 CommentAdded=Comment added
 CommentDeleted=Comment deleted
 Everybody=Everybody
-PayedBy=Payed by
-PayedTo=Payed to
+PayedBy=Paid by
+PayedTo=Paid to
 Monthly=Monthly
 Quarterly=Quarterly
 Annual=Annual
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index e5975516e4f..e28f242d964 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -33,7 +33,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
-MemberId=Member id 
+MemberId=Member id
 NewMember=New member
 MemberType=Member type
 MemberTypeId=Member type id
@@ -61,7 +61,7 @@ ConfirmDeleteMemberType=Are you sure you want to delete this member type?
 MemberTypeDeleted=Member type deleted
 MemberTypeCanNotBeDeleted=Member type can not be deleted
 NewSubscription=New subscription
-NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. 
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
 Subscription=Subscription
 Subscriptions=Subscriptions
 SubscriptionLate=Late
@@ -115,7 +115,7 @@ SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated 
+YourMembershipWasValidated=Your membership was validated
 YourSubscriptionWasRecorded=Your new subscription was recorded
 SubscriptionReminderEmail=Subscription reminder
 YourMembershipWasCanceled=Your membership was canceled
@@ -125,7 +125,7 @@ ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that you
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or is already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br> 
+ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index ffbb345fb1c..940088368d5 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -4,7 +4,7 @@ EnterNameOfModuleDesc=Enter name of the module/application to create with no spa
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Path where modules are generated/edited (first alternative directory defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
-ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory 
+ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
 NewModule=New module
 NewObject=New object
 ModuleKey=Module key
@@ -49,7 +49,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0). 
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -95,7 +95,7 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Delete table if empty)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
-InitStructureFromExistingTable=Build the structure array string of an existing table 
+InitStructureFromExistingTable=Build the structure array string of an existing table
 UseAboutPage=Disable the about page
 UseDocFolder=Disable the documentation folder
-UseSpecificReadme=Use a specific ReadMe
\ No newline at end of file
+UseSpecificReadme=Use a specific ReadMe
diff --git a/htdocs/langs/en_US/multicurrency.lang b/htdocs/langs/en_US/multicurrency.lang
index 048e6721310..47c5590b862 100644
--- a/htdocs/langs/en_US/multicurrency.lang
+++ b/htdocs/langs/en_US/multicurrency.lang
@@ -17,4 +17,4 @@ rate=rate
 MulticurrencyReceived=Received, original currency
 MulticurrencyRemainderToTake=Remaining amount, original currency
 MulticurrencyPaymentAmount=Payment amount, original currency
-AmountToOthercurrency=Amount To (in currency of receiving account)
\ No newline at end of file
+AmountToOthercurrency=Amount To (in currency of receiving account)
diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang
index 356f1ff6efe..906de8c2f37 100644
--- a/htdocs/langs/en_US/opensurvey.lang
+++ b/htdocs/langs/en_US/opensurvey.lang
@@ -19,7 +19,7 @@ SelectedDays=Selected days
 TheBestChoice=The best choice currently is
 TheBestChoices=The best choices currently are
 with=with
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. 
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
 CommentsOfVoters=Comments of voters
 ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
 RemovePoll=Remove poll
@@ -58,4 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
\ No newline at end of file
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index e5518951222..4cd600bdc8b 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -56,7 +56,7 @@ StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered 
+ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
 MenuOrdersToBill=Orders delivered
 MenuOrdersToBill2=Billable orders
 ShipProduct=Ship product
@@ -145,14 +145,14 @@ PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete proforma invoice (logo…)
 CreateInvoiceForThisCustomer=Bill orders
 NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. 
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
 Ordered=Ordered
 OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.  
+OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
 IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
 CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
-SetShippingMode=Set shipping mode
\ No newline at end of file
+SetShippingMode=Set shipping mode
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index d9197b04383..67b9681fa3b 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -51,11 +51,11 @@ Notify_COMPANY_CREATE=Third party created
 Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
-Notify_BILL_PAYED=Customer invoice payed
+Notify_BILL_PAYED=Customer invoice paid
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
-Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
+Notify_BILL_SUPPLIER_PAYED=Supplier invoice paid
 Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail
 Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
 Notify_CONTRACT_VALIDATE=Contract validated
@@ -80,15 +80,15 @@ LinkedObject=Linked object
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nYou will find here the shipping __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nYou will find here the intervention __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to have not been paid. The invoice is attached, as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find attached commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find attached price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find attached order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find attached our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find attached invoice __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find attached shipping __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find attached intervention __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
@@ -188,7 +188,7 @@ NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
 EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
 EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInvoiceValidated=The invoice %s has been validated.
-EMailTextInvoicePayed=The invoice %s has been payed.
+EMailTextInvoicePayed=The invoice %s has been paid.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextProposalClosedSigned=The proposal %s has been closed signed.
 EMailTextOrderValidated=The order %s has been validated.
diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang
index 89e7ff48b79..cf0bd40b716 100644
--- a/htdocs/langs/en_US/paybox.lang
+++ b/htdocs/langs/en_US/paybox.lang
@@ -35,4 +35,4 @@ NewPayboxPaymentFailed=New Paybox payment tried but failed
 PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
\ No newline at end of file
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index c088debc518..d34bb4baf18 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -18,7 +18,7 @@ NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
 ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)
 ReturnURLAfterPayment=Return URL after payment
-ValidationOfOnlinePaymentFailed=Validation of online payment failed 
+ValidationOfOnlinePaymentFailed=Validation of online payment failed
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
 SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
@@ -31,4 +31,4 @@ PaypalLiveEnabled=PayPal live enabled (otherwise test/sandbox mode)
 PaypalImportPayment=Import PayPal payments
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
-ValidationOfPaymentFailed=Validation of payment has failed
\ No newline at end of file
+ValidationOfPaymentFailed=Validation of payment has failed
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index f0eafc807cf..54270c4a23b 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -21,4 +21,4 @@ ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
 ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
\ No newline at end of file
+StockDetailPerBatch=Stock detail per lot
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 0dde8ad538a..90436801571 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -130,7 +130,7 @@ DiscountQtyMin=Default discount for qty
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
 NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product
 PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell 
+PredefinedServicesToSell=Predefined services to sell
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
 PredefinedProductsToPurchase=Predefined product to purchase
 PredefinedServicesToPurchase=Predefined services to purchase
@@ -269,7 +269,7 @@ GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.c
 UpdateInterval=Update interval (minutes)
 LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is 
+PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
 IncludingProductWithTag=Including product/service with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
@@ -292,7 +292,7 @@ SubProduct=Sub product
 ProductSheet=Product sheet
 ServiceSheet=Service sheet
 PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...) 
+GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
 UseProductFournDesc=Use supplier descriptions of products in supplier documents
 ProductSupplierDescription=Supplier description for the product
 #Attributes
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 29216b7d8b3..ce94a6dcc46 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Project contacts
-ProjectsImContactFor=Projects I'm explicitely a contact of 
+ProjectsImContactFor=Projects I'm explicitely a contact of
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
 MyProjectsDesc=This view is limited to projects you are a contact for
@@ -126,7 +126,7 @@ TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now. 
+TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
index 21ac0a0d503..0a036a588ea 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -82,4 +82,4 @@ DefaultModelPropalCreate=Default model creation
 DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
 DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
 ProposalCustomerSignature=Written acceptance, company stamp, date and signature
-ProposalsStatisticsSuppliers=Supplier proposals statistics 
+ProposalsStatisticsSuppliers=Supplier proposals statistics
diff --git a/htdocs/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang
index 2ba84f19514..620517b5324 100644
--- a/htdocs/langs/en_US/salaries.lang
+++ b/htdocs/langs/en_US/salaries.lang
@@ -16,4 +16,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr
 TJMDescription=This value is currently as information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Salary statistics
\ No newline at end of file
+SalariesStatistics=Salary statistics
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index b8474775e75..2b46ada5ee9 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -56,7 +56,7 @@ ProductQtyInCustomersOrdersRunning=Product quantity into open customer orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into open purchase orders
 ProductQtyInShipmentAlreadySent=Product quantity from open customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open supplier order already received
-NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse. 
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
 WeightVolShort=Weight/Vol.
 ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
diff --git a/htdocs/langs/en_US/sms.lang b/htdocs/langs/en_US/sms.lang
index bf92a7b63cf..79bd8827198 100644
--- a/htdocs/langs/en_US/sms.lang
+++ b/htdocs/langs/en_US/sms.lang
@@ -48,4 +48,4 @@ SmsInfoNumero= (international format ie : +33899701761)
 DelayBeforeSending=Delay before sending (minutes)
 SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
 SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
-DisableStopIfSupported=Disable STOP message (if supported) 
+DisableStopIfSupported=Disable STOP message (if supported)
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 410ee2e887d..b3313f5ff73 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -45,7 +45,6 @@ MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
 LabelMovement=Movement label
-TypeMovement=Movement type
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -79,7 +78,7 @@ StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
 PhysicalStock=Physical stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements. 
+RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
 RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
 VirtualStock=Virtual stock
 VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
@@ -138,7 +137,7 @@ MovementLabel=Label of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
-WarehouseAllowNegativeTransfer=Stock can be negative 
+WarehouseAllowNegativeTransfer=Stock can be negative
 qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
@@ -178,7 +177,7 @@ inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory 
+inventoryOnDate=Inventory
 INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
@@ -204,4 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management supports Services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
-ReceiveProducts=Receive items
\ No newline at end of file
+ReceiveProducts=Receive items
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index 0f9fcac1d02..2ede3bc474e 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<
 ExpenseReportPaid=An expense report was paid
 ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation. 
+AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information company
 TripNDF=Informations expense report
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
@@ -154,4 +154,4 @@ nolimitbyEX_EXP=by line (no limitation)
 
 CarCategory=Category of car
 ExpenseRangeOffset=Offset amount: %s
-RangeIk=Mileage range
\ No newline at end of file
+RangeIk=Mileage range
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 20c3e90ae41..68fffde3bb0 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -35,7 +35,7 @@ SuperAdministrator=Super Administrator
 SuperAdministratorDesc=Global administrator
 AdministratorDesc=Administrator
 DefaultRights=Default permissions
-DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
+DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go to user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
 LastName=Last name
 FirstName=First name
@@ -108,4 +108,4 @@ UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
 DateEmployment=Date of Employment
-DateEmploymentEnd=End date of Employment
\ No newline at end of file
+DateEmploymentEnd=End date of Employment
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 9ed064b5d1e..a14d05132cd 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - website 
+# Dolibarr language file - Source file is en_US - website
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
@@ -16,7 +16,7 @@ WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Web site .htaccess file
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.   
+EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
 EditCss=Edit website properties
 EditMenu=Edit menu
@@ -45,12 +45,12 @@ CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</st
 ReadPerm=Read
 WritePerm=Write
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.  
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. 
+YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $weblangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
@@ -90,4 +90,6 @@ EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
 ZipOfWebsitePackageToImport=Zip file of website package
 ShowSubcontainers=Show included containers
-InternalURLOfPage=Internal URL of page
\ No newline at end of file
+InternalURLOfPage=Internal URL of page
+ThisPageIsTranslationOf=This page/container is translation of
+ThisPageHasTranslationPages=This page/container has translation
\ No newline at end of file
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 6162bfe6aa1..c2c384793c4 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -61,7 +61,7 @@ CreateAll=Create direct debit file (all)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission 
+NotifyTransmision=Withdrawal Transmission
 NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
@@ -80,7 +80,7 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request: 
+WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
 SepaMandate=SEPA Direct Debit Mandate
 SepaMandateShort=SEPA Mandate
@@ -103,7 +103,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
 
-### Notifications 
+### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
 InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
 InfoTransSubject=Transmission of direct debit payment order %s to bank
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index 3dab69667c4..c16caf44765 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - workflow 
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -17,4 +17,4 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer ord
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
 AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
\ No newline at end of file
+AutomaticClassification=Automatic classification
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 3e1ceb8b2dc..78b07ddf7cb 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -302,7 +302,7 @@ class Product extends CommonObject
 
 	/**
 	 * @deprecated
-	 * @see ref_supplier
+	 * @see $ref_supplier
 	 */
 	public $ref_fourn;
 	public $ref_supplier;
@@ -3285,7 +3285,7 @@ class Product extends CommonObject
 	 *
 	 *  @param	int		$fromId     Id product source
 	 *  @param  int		$toId       Id product target
-	 *  @return nt         			< 0 if KO, > 0 if OK
+	 *  @return int         			< 0 if KO, > 0 if OK
 	 */
 	function clone_price($fromId, $toId)
 	{
@@ -4008,7 +4008,7 @@ class Product extends CommonObject
 	 *										'warehouseclosed' = Load stock from closed warehouses only,
 	 *										'warehouseinternal' = Load stock from warehouses for internal correction/transfer only
 	 *    @return     int                   < 0 if KO, > 0 if OK
-	 *    @see		  load_virtual_stock, getBatchInfo
+	 *    @see		  load_virtual_stock(), loadBatchInfo()
 	 */
 	function load_stock($option='')
 	{
@@ -4077,68 +4077,80 @@ class Product extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	/**
 	 *    Load value ->stock_theorique of a product. Property this->id must be defined.
 	 *    This function need a lot of load. If you use it on list, use a cache to execute it one for each product id.
 	 *
 	 *    @return   int             < 0 if KO, > 0 if OK
-	 *    @see		load_stock, getBatchInfo
+	 *    @see		load_stock(), loadBatchInfo()
 	 */
-    function load_virtual_stock()
-    {
-        // phpcs:enable
-        global $conf;
+	function load_virtual_stock()
+	{
+		// phpcs:enable
+		global $conf, $hookmanager, $action;
 
-        $stock_commande_client=0;
-        $stock_commande_fournisseur=0;
-        $stock_sending_client=0;
-        $stock_reception_fournisseur=0;
+		$stock_commande_client=0;
+		$stock_commande_fournisseur=0;
+		$stock_sending_client=0;
+		$stock_reception_fournisseur=0;
 
-        if (! empty($conf->commande->enabled))
-        {
-            $result=$this->load_stats_commande(0,'1,2', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_commande_client=$this->stats_commande['qty'];
-        }
-        if (! empty($conf->expedition->enabled))
-        {
-            $result=$this->load_stats_sending(0,'1,2', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_sending_client=$this->stats_expedition['qty'];
-        }
-        if (! empty($conf->fournisseur->enabled))
-        {
-            $result=$this->load_stats_commande_fournisseur(0,'1,2,3,4', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_commande_fournisseur=$this->stats_commande_fournisseur['qty'];
+		if (! empty($conf->commande->enabled))
+		{
+			$result=$this->load_stats_commande(0,'1,2', 1);
+			if ($result < 0) dol_print_error($this->db,$this->error);
+			$stock_commande_client=$this->stats_commande['qty'];
+		}
+		if (! empty($conf->expedition->enabled))
+		{
+			$result=$this->load_stats_sending(0,'1,2', 1);
+			if ($result < 0) dol_print_error($this->db,$this->error);
+			$stock_sending_client=$this->stats_expedition['qty'];
+		}
+		if (! empty($conf->fournisseur->enabled))
+		{
+			$result=$this->load_stats_commande_fournisseur(0,'1,2,3,4', 1);
+			if ($result < 0) dol_print_error($this->db,$this->error);
+			$stock_commande_fournisseur=$this->stats_commande_fournisseur['qty'];
 
-            $result=$this->load_stats_reception(0,'4', 1);
-            if ($result < 0) dol_print_error($this->db,$this->error);
-            $stock_reception_fournisseur=$this->stats_reception['qty'];
-        }
+			$result=$this->load_stats_reception(0,'4', 1);
+			if ($result < 0) dol_print_error($this->db,$this->error);
+			$stock_reception_fournisseur=$this->stats_reception['qty'];
+		}
 
-        // Stock decrease mode
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
-            $this->stock_theorique=$this->stock_reel-$stock_commande_client+$stock_sending_client;
-        }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
-            $this->stock_theorique=$this->stock_reel;
-        }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
-            $this->stock_theorique=$this->stock_reel-$stock_commande_client;
-        }
-        // Stock Increase mode
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
-            $this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
-        }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
-            $this->stock_theorique-=$stock_reception_fournisseur;
-        }
-        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
-            $this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
-        }
-    }
+		// Stock decrease mode
+		if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+			$this->stock_theorique=$this->stock_reel-$stock_commande_client+$stock_sending_client;
+		}
+		if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
+			$this->stock_theorique=$this->stock_reel;
+		}
+		if (! empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+			$this->stock_theorique=$this->stock_reel-$stock_commande_client;
+		}
+		// Stock Increase mode
+		if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+			$this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
+		}
+		if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
+			$this->stock_theorique-=$stock_reception_fournisseur;
+		}
+		if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
+			$this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
+		}
+
+		if (! is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('productdao'));
+		$parameters=array('id'=>$this->id);
+		// Note that $action and $object may have been modified by some hooks
+		$reshook=$hookmanager->executeHooks('loadvirtualstock', $parameters, $this, $action);
+		if ($reshook > 0) $this->stock_theorique = $hookmanager->resArray['stock_theorique'];
+
+		return 1;
+	}
 
 
 	/**
@@ -4146,7 +4158,7 @@ class Product extends CommonObject
 	 *
 	 *	@param		string		$batch		Lot/serial number
 	 *  @return     array					Array with record into product_batch
-	 *  @see		load_stock, load_virtual_stock
+	 *  @see		load_stock(), load_virtual_stock()
 	 */
     function loadBatchInfo($batch)
     {
@@ -4742,51 +4754,51 @@ class Product extends CommonObject
 		}
 	}
 
-    /**
-     *  Load information for tab info
-     *
-     *  @param  int		$id     Id of thirdparty to load
-     *  @return	void
-     */
-    function info($id)
-    {
-        $sql = "SELECT p.rowid, p.ref, p.datec as date_creation, p.tms as date_modification,";
-        $sql.= " p.fk_user_author, p.fk_user_modif";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
-        $sql.= " WHERE p.rowid = ".$id;
+	/**
+	 *  Load information for tab info
+	 *
+	 *  @param  int		$id     Id of thirdparty to load
+	 *  @return	void
+	 */
+	function info($id)
+	{
+		$sql = "SELECT p.rowid, p.ref, p.datec as date_creation, p.tms as date_modification,";
+		$sql.= " p.fk_user_author, p.fk_user_modif";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
+		$sql.= " WHERE p.rowid = ".$id;
 
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-
-                $this->id = $obj->rowid;
-
-                if ($obj->fk_user_author) {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation     = $cuser;
-                }
-
-                if ($obj->fk_user_modif) {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modif);
-                    $this->user_modification = $muser;
-                }
-
-                $this->ref			     = $obj->ref;
-                $this->date_creation     = $this->db->jdate($obj->date_creation);
-                $this->date_modification = $this->db->jdate($obj->date_modification);
-            }
-
-            $this->db->free($result);
-
-        }
-        else
+		$result=$this->db->query($sql);
+		if ($result)
 		{
-            dol_print_error($this->db);
-        }
-    }
-}
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+
+				$this->id = $obj->rowid;
+
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation     = $cuser;
+				}
+
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+
+				$this->ref			     = $obj->ref;
+				$this->date_creation     = $this->db->jdate($obj->date_creation);
+				$this->date_modification = $this->db->jdate($obj->date_modification);
+			}
+
+			$this->db->free($result);
+
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+}
\ No newline at end of file
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index dd18a115ab6..e2632fe244e 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -765,7 +765,7 @@ elseif ($object->id > 0)
 
 		// Label
 		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
-		print '<td><input class="quatrevingtpercent" name="title" value="'.$object->title.'"></td></tr>';
+		print '<td><input class="quatrevingtpercent" name="title" value="'.dol_escape_htmltag($object->title).'"></td></tr>';
 
 		// Status
 		print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td><td>';
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index 862d8ada71a..19abc48094b 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -18,8 +18,7 @@
 /**
  *     	\file       htdocs/public/website/index.php
  *		\ingroup    website
- *		\brief      Page to output pages
- *		\author	    Laurent Destailleur
+ *		\brief      Wrapper to output pages when website is powered by Dolibarr instead of a native web server
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
@@ -59,88 +58,91 @@ $accessallowed = 1;
 $type='';
 
 
-/*
- * View
- */
+if (empty($pageid))
+{
+	require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+
+	$object=new Website($db);
+	$object->fetch(0, $websitekey);
+
+	if (empty($object->id))
+	{
+		if (empty($pageid))
+		{
+			// Return header 404
+			header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found", true, 404);
+
+			include DOL_DOCUMENT_ROOT.'/public/error-404.php';
+			exit;
+		}
+	}
+
+	$objectpage=new WebsitePage($db);
+
+	if ($pageref)
+	{
+		$result=$objectpage->fetch(0, $object->id, $pageref);
+		if ($result > 0)
+		{
+			$pageid = $objectpage->id;
+		}
+		elseif($result == 0)
+		{
+			// Page not found from ref=pageurl, we try using alternative alias
+			$result=$objectpage->fetch(0, $object->id, null, $pageref);
+			if ($result > 0)
+			{
+				$pageid = $objectpage->id;
+			}
+		}
+	}
+	else
+	{
+		if ($object->fk_default_home > 0)
+		{
+			$result=$objectpage->fetch($object->fk_default_home);
+			if ($result > 0)
+			{
+				$pageid = $objectpage->id;
+			}
+		}
+
+		if (empty($pageid))
+		{
+			$array=$objectpage->fetchAll($object->id);
+			if (is_array($array) && count($array) > 0)
+			{
+				$firstrep=reset($array);
+				$pageid=$firstrep->id;
+			}
+		}
+	}
+}
+if (empty($pageid))
+{
+	// Return header 404
+	header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found", true, 404);
+
+	$langs->load("website");
+
+	if (! GETPOSTISSET('pageref')) print $langs->trans("PreviewOfSiteNotYetAvailable", $websitekey);
+
+	include DOL_DOCUMENT_ROOT.'/public/error-404.php';
+	exit;
+}
 
 $appli=constant('DOL_APPLICATION_TITLE');
 if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
 
+
+
+/*
+ * View
+ */
+
 //print 'Directory with '.$appli.' websites.<br>';
 
-if (empty($pageid))
-{
-    require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
-
-    $object=new Website($db);
-    $object->fetch(0, $websitekey);
-
-	if (empty($object->id))
-    {
-        if (empty($pageid))
-        {
-            // Return header 404
-            header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found", true, 404);
-
-            include DOL_DOCUMENT_ROOT.'/public/error-404.php';
-            exit;
-        }
-    }
-
-    $objectpage=new WebsitePage($db);
-
-    if ($pageref)
-    {
-    	$result=$objectpage->fetch(0, $object->id, $pageref);
-    	if ($result > 0)
-	    {
-	        $pageid = $objectpage->id;
-	    }
-	    elseif($result == 0)
-	    {
-	    	// Page not found from ref=pageurl, we try using alternative alias
-	    	$result=$objectpage->fetch(0, $object->id, null, $pageref);
-	    	if ($result > 0)
-	    	{
-	    		$pageid = $objectpage->id;
-	    	}
-	    }
-    }
-    else
-    {
-	    if ($object->fk_default_home > 0)
-	    {
-	        $result=$objectpage->fetch($object->fk_default_home);
-	        if ($result > 0)
-	        {
-	            $pageid = $objectpage->id;
-	        }
-	    }
-
-	    if (empty($pageid))
-	    {
-	        $array=$objectpage->fetchAll($object->id);
-	        if (is_array($array) && count($array) > 0)
-	        {
-	            $firstrep=reset($array);
-	            $pageid=$firstrep->id;
-	        }
-	    }
-    }
-}
-if (empty($pageid))
-{
-    // Return header 404
-    header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found", true, 404);
-
-    $langs->load("website");
-
-    if (! GETPOSTISSET('pageref')) print $langs->trans("PreviewOfSiteNotYetAvailable", $websitekey);
-
-    include DOL_DOCUMENT_ROOT.'/public/error-404.php';
-    exit;
-}
 
 // Security: Delete string ../ into $original_file
 global $dolibarr_main_data_root;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index b347d305dd9..3b67c895e0d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1236,6 +1236,11 @@ div.backgroundsemitransparent {
 	padding-left: 10px;
 	padding-right: 10px;
 }
+
+
+
+/* Login */
+
 div.login_block {
 	/* position: initial !important;*/
 	display: none;
@@ -1250,6 +1255,10 @@ div.login_block {
 	color: #333 !important;
 	font-weight: normal !important;
 }
+
+
+
+
 #id-right {
 	padding-left: 0 ! important;
 }
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 843304fbe45..3f51f669829 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1079,20 +1079,72 @@ class Website extends CommonObject
 	}
 
 	/**
-	 * Component to select language (Full CSS Only)
+	 * Component to select language inside a container (Full CSS Only)
 	 *
-	 * @param	array		$languagecodes			Language codes array. Example: array('en_US','fr_FR','de_DE','es_ES')
-	 * @param	Translate	$weblangs				Language Object
-	 * @param	string		$morecss				More CSS class on component
-	 * @param	string		$htmlname				Suffix for HTML name
-	 * @return 	string								HTML select component
+	 * @param	array|string	$languagecodes			'auto' to show all languages available for page, or language codes array like array('en_US','fr_FR','de_DE','es_ES')
+	 * @param	Translate		$weblangs				Language Object
+	 * @param	string			$morecss				More CSS class on component
+	 * @param	string			$htmlname				Suffix for HTML name
+	 * @return 	string									HTML select component
 	 */
 	public function componentSelectLang($languagecodes, $weblangs, $morecss='', $htmlname='')
 	{
+		global $websitepagefile, $website;
+
 		if (! is_object($weblangs)) return 'ERROR componentSelectLang called with parameter $weblangs not defined';
 
-		$languagecodeselected = $weblangs->defaultlang;
+		// Load tmppage if we have $websitepagefile defined
+		$tmppage=new WebsitePage($this->db);
+
+		$pageid = 0;
+		if (! empty($websitepagefile))
+		{
+			$pageid = str_replace(array('.tpl.php', 'page'), array('', ''), basename($websitepagefile));
+			if ($pageid > 0)
+			{
+				$tmppage->fetch($pageid);
+			}
+		}
+
+		// Fill with existing translation, nothing if none
+		if (! is_array($languagecodes) && $pageid > 0)
+		{
+			$languagecodes = array();
+
+			$sql ="SELECT wp.rowid, wp.lang, wp.pageurl, wp.fk_page";
+			$sql.=" FROM ".MAIN_DB_PREFIX."website_page as wp";
+			$sql.=" WHERE wp.fk_website = ".$website->id;
+			$sql.=" AND (wp.fk_page = ".$pageid." OR wp.rowid  = ".$pageid;
+			if ($tmppage->fk_page > 0) $sql.=" OR wp.fk_page = ".$tmppage->fk_page." OR wp.rowid = ".$tmppage->fk_page;
+			$sql.=")";
+
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$newlang = $obj->lang;
+					if ($obj->rowid == $pageid) $newlang = $obj->lang;
+					if (! in_array($newlang, $languagecodes)) $languagecodes[]=$newlang;
+				}
+			}
+		}
+		// Now $languagecodes is always an array
+
+		$languagecodeselected= $weblangs->defaultlang;	// Because we must init with a value, but real value is the lang of main parent container
+		if (! empty($websitepagefile))
+		{
+			$pageid = str_replace(array('.tpl.php', 'page'), array('', ''), basename($websitepagefile));
+			if ($pageid > 0)
+			{
+
+				$languagecodeselected=$tmppage->lang;
+				if (! in_array($tmppage->lang, $languagecodes)) $languagecodes[]=$tmppage->lang;	// We add language code of page into combo list
+			}
+		}
+
 		$weblangs->load('languages');
+		//var_dump($weblangs->defaultlang);
 
 		$url = $_SERVER["REQUEST_URI"];
 		$url = preg_replace('/(\?|&)l=([a-zA-Z_]*)/', '', $url);	// We remove param l from url
@@ -1103,7 +1155,8 @@ class Website extends CommonObject
 		$MAXHEIGHT = 4 * $HEIGHTOPTION;
 		$nboflanguage = count($languagecodes);
 
-		$out.='<!-- componentSelectLang'.$htmlname.' -->'."\n";
+		$out ='<!-- componentSelectLang'.$htmlname.' -->'."\n";
+
 		$out.= '<style>';
 		$out.= '.componentSelectLang'.$htmlname.':hover { height: '.min($MAXHEIGHT, ($HEIGHTOPTION * $nboflanguage)).'px; overflow-x: hidden; overflow-y: '.((($HEIGHTOPTION * $nboflanguage) > $MAXHEIGHT) ? ' scroll' : 'hidden').'; }'."\n";
 		$out.= '.componentSelectLang'.$htmlname.' li { line-height: '.$HEIGHTOPTION.'px; }'."\n";
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index b6ef620b7d2..6f8713b5adc 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -197,8 +197,11 @@ class WebsitePage extends CommonObject
 
 				$this->fk_website = $obj->fk_website;
 				$this->type_container = $obj->type_container;
+
 				$this->pageurl = $obj->pageurl;
+				$this->ref = $obj->pageurl;
 				$this->aliasalt = preg_replace('/,+$/', '', preg_replace('/^,+/', '', $obj->aliasalt));
+
 				$this->title = $obj->title;
 				$this->description = $obj->description;
 				$this->keywords = $obj->keywords;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 1d277c32ed7..dc8209bcb01 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -459,6 +459,7 @@ if ($action == 'addcontainer')
 				//$objectpage->htmlheader = preg_replace('/<meta name="msvalidate.01[^>]*>\n*/ims', '', $objectpage->htmlheader);
 				$objectpage->htmlheader = preg_replace('/<title>[^<]*<\/title>\n*/ims', '', $objectpage->htmlheader);
 				$objectpage->htmlheader = preg_replace('/<link[^>]*rel="shortcut[^>]*>\n/ims', '', $objectpage->htmlheader);
+				$objectpage->htmlheader = preg_replace('/<link[^>]*rel="canonical[^>]*>\n/ims', '', $objectpage->htmlheader);
 
 				// Now loop to fetch JS
 				$tmp = $objectpage->htmlheader;
@@ -1749,7 +1750,7 @@ if (count($object->records) > 0)	// There is at least one web site
 
 		$htmltext = $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint, $dataroot);
 		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
+		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 		print '<a class="websitebuttonsitepreview" id="previewsite" href="'.$urlwithroot.'/public/website/index.php?website='.$websitekey.'" target="tab'.$websitekey.'" alt="'.dol_escape_htmltag($htmltext).'">';
 		print $form->textwithpicto('', $htmltext, 1, 'preview');
 		print '</a>';
@@ -1760,7 +1761,7 @@ if (count($object->records) > 0)	// There is at least one web site
 		$htmltext =$langs->trans("SetHereVirtualHost", $dataroot);
 		$htmltext.='<br>';
 		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
+		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 		$htmltext.='<br>';
 		$htmltext.='<br>';
 		$htmltext.=$langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
@@ -1782,7 +1783,7 @@ if (count($object->records) > 0)	// There is at least one web site
 			$htmltext = $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>');
 			$htmltext.='<br>';
 			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
+			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 			print '<a class="websitebuttonsitepreview'.($urlext?'':' websitebuttonsitepreviewdisabled cursornotallowed').'" id="previewsiteext" href="'.$urlext.'" target="tab'.$websitekey.'ext" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
 			print $form->textwithpicto('', $htmltext, 1, 'preview_ext');
 			print '</a>';
@@ -1926,10 +1927,11 @@ if (count($object->records) > 0)	// There is at least one web site
 					// Create an array for form
 					$preselectedlanguage = GETPOST('newlang', 'az09') ? GETPOST('newlang', 'az09') : ($objectpage->lang ? $objectpage->lang : $langs->defaultlang);
 					$formquestion = array(
-						array('type' => 'text', 'tdclass'=>'maxwidth200', 'name' => 'pageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME"), 'value'=> 'copy_of_'.$objectpage->pageurl),
+						array('type' => 'hidden', 'name' => 'sourcepageurl', 'value'=> $objectpage->pageurl),
 						array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0),
 						array('type' => 'other','name' => 'newlang', 'label' => $langs->trans("Language"), 'value' => $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, 1, 0, 0, 'minwidth200', 0, 1)),
 						array('type' => 'other','name' => 'newwebsite', 'label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)),
+						array('type' => 'text', 'tdclass'=>'maxwidth200 fieldrequired', 'name' => 'pageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME"), 'value'=> 'copy_of_'.$objectpage->pageurl),
 					);
 
 				   	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?website='.$object->ref.'&pageid=' . $pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
@@ -1943,6 +1945,7 @@ if (count($object->records) > 0)	// There is at least one web site
 
 				print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditHTMLSource")).'" name="editsource">';
 
+				print '<!-- button EditInLine and ShowSubcontainers -->'."\n";
 				print '<div class="websiteselectionsection inline-block">';
 				print '<div class="inline-block">';
 				print $langs->trans("EditInLine");
@@ -1966,12 +1969,12 @@ if (count($object->records) > 0)	// There is at least one web site
 				print '</div>';
 				print '<div class="inline-block">';
 				print $langs->trans("ShowSubcontainers");
-				if ($websitepage->grabbed_from)
+				/*if ($websitepage->grabbed_from)
 				{
 					print '<a class="button nobordertransp opacitymedium nohoverborder"'.$disabled.' href="#" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'">'.img_picto($langs->trans("OnlyEditionOfSourceForGrabbedContent"),'switch_off','',false,0,0,'','nomarginleft').'</a>';
 				}
 				else
-				{
+				{*/
 					if (empty($conf->global->WEBSITE_SUBCONTAINERSINLINE))
 					{
 						print '<a class="button nobordertransp nohoverborder"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOff"),'switch_off','',false,0,0,'','nomarginleft').'</a>';
@@ -1980,7 +1983,7 @@ if (count($object->records) > 0)	// There is at least one web site
 					{
 						print '<a class="button nobordertransp nohoverborder"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unsetshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOn"),'switch_on','',false,0,0,'','nomarginleft').'</a>';
 					}
-				}
+				/*}*/
 				print '</div>';
 				print '</div>';
 
@@ -2002,7 +2005,7 @@ if (count($object->records) > 0)	// There is at least one web site
 
 			$htmltext = $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot);
 			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
+			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 
 			print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$websitekey.'" alt="'.dol_escape_htmltag($htmltext).'">';
 			print $form->textwithpicto('', $htmltext, 1, 'preview');
@@ -2320,7 +2323,7 @@ if ($action == 'createsite')
 	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>websiteref</i>');
 	$htmltext.='<br>';
 	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT);
+	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 
 	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'tooltipvirtual');
 	print '</td><td>';
@@ -2517,6 +2520,53 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print $formadmin->select_language($pagelang?$pagelang:$langs->defaultlang, 'WEBSITE_LANG', 0, null, '1');
 	print '</td></tr>';
 
+	if ($action != 'createcontainer')
+	{
+		// Translation of
+		if ($objectpage->fk_page > 0)
+		{
+			print '<tr><td>';
+			print $langs->trans('ThisPageIsTranslationOf');
+			print '</td><td>';
+			$sourcepage=new WebsitePage($db);
+			$result = $sourcepage->fetch($objectpage->fk_page);
+			if ($result == 0)	// not found, we can reset value
+			{
+
+			}
+			elseif ($result > 0)
+			{
+				print $sourcepage->getNomUrl(1);
+			}
+			print '</td></tr>';
+		}
+
+		// Has translation pages
+		$sql='SELECT rowid, lang from '.MAIN_DB_PREFIX.'website_page where fk_page = '.$objectpage->id;
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num_rows = $db->num_rows($resql);
+			if ($num_rows > 0)
+			{
+				print '<tr><td>';
+				print $langs->trans('ThisPageHasTranslationPages');
+				print '</td><td>';
+				$i=0;
+				while ($obj = $db->fetch_object($resql))
+				{
+					$tmppage=new WebsitePage($db);
+					$tmppage->fetch($obj->rowid);
+					if ($i > 0) print ' - ';
+					print $tmppage->getNomUrl(1).' ('.$tmppage->lang.')';
+					$i++;
+				}
+				print '</td></tr>';
+			}
+		}
+		else dol_print_error($db);
+	}
+
 	print '<tr><td class="titlefieldcreate">';
 	$htmlhelp=$langs->trans("WEBSITE_ALIASALTDesc");
 	print $form->textwithpicto($langs->trans('WEBSITE_ALIASALT'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip');